From b21eba1c4d0e7a6f4ffc9cf21638e80709f0a510 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 3 Apr 2025 17:25:07 +0200 Subject: [PATCH 001/167] docker: upgrade Ubuntu 20.04/focal -> 24.04/noble, node 20 -> 22 --- Dockerfile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8c5e24..660e6cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,18 @@ -# FROM mcr.microsoft.com/playwright:v1.20.0 -# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal -FROM ubuntu:jammy +# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.noble +FROM ubuntu:noble # Configuration variables are at the end! +ARG DEBIAN_FRONTEND=noninteractive # https://github.com/hadolint/hadolint/wiki/DL4006 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -# Install up-to-date node & npm, deps for virtual screen & noVNC, firefox, pip for apprise. +# Install up-to-date node & npm, deps for virtual screen & noVNC, firefox, pipx for apprise. RUN apt-get update \ - && apt-get install --no-install-recommends -y curl ca-certificates gnupg \ + && apt-get install -y curl wget gpg ca-certificates \ && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ + && curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install --no-install-recommends -y \ nodejs \ @@ -22,20 +21,20 @@ RUN apt-get update \ tini \ novnc websockify \ dos2unix \ - python3-pip \ + pipx \ # && npx playwright install-deps firefox \ + # When running playwright without deps, it said to install the below (which should be what install-deps above does) && apt-get install --no-install-recommends -y \ - libgtk-3-0 \ - libasound2 \ libxcomposite1 \ + libxcursor1 \ + libgtk-3-0t64 \ libpangocairo-1.0-0 \ libpango-1.0-0 \ - libatk1.0-0 \ + libatk1.0-0t64 \ libcairo-gobject2 \ libcairo2 \ libgdk-pixbuf-2.0-0 \ - libdbus-glib-1-2 \ - libxcursor1 \ + libasound2t64 \ && apt-get autoremove -y \ && apt-get clean \ && rm -rf \ @@ -44,12 +43,13 @@ RUN apt-get update \ /var/cache/* \ /var/lib/apt/lists/* \ /var/tmp/* - +# # RUN node --version # RUN npm --version -RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html -RUN pip install apprise +# TODO This was vnc_auto.html before which no longer exists, but only vnc_lite.html and vnc.html which we link now: +RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html +RUN pipx install apprise WORKDIR /fgc COPY package*.json ./ From ba69580d51f94581140df012a80d8dc7218e9a51 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 16 May 2025 00:54:28 +0200 Subject: [PATCH 002/167] eg: use patchright to avoid captcha, #183 --- README.md | 6 ++--- epic-games.js | 36 ++++++++++---------------- package-lock.json | 65 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 83 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 17ec854..c3cc8c8 100644 --- a/README.md +++ b/README.md @@ -36,13 +36,13 @@ Data (including json files with claimed games, codes to redeem, screenshots) is 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` +3. Run `npm install && npx patchright install chromium` 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`... -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`. +Patchright/Playwright will download its Chromium 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 patchright install chromium --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. diff --git a/epic-games.js b/epic-games.js index 4db1e75..68c8b7c 100644 --- a/epic-games.js +++ b/epic-games.js @@ -1,9 +1,10 @@ -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra +// import { chromium } from 'playwright-chromium'; +import { chromium } from 'patchright'; import { authenticator } from 'otplib'; import chalk from 'chalk'; import path from 'path'; import { existsSync, writeFileSync, appendFileSync } from 'fs'; -import { resolve, jsonDb, datetime, stealth, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; +import { resolve, jsonDb, datetime, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'epic-games', ...a); @@ -17,35 +18,26 @@ const db = await jsonDb('epic-games.json', {}); if (cfg.time) console.time('startup'); -const browserPrefs = path.join(cfg.dir.browser, 'prefs.js'); -if (existsSync(browserPrefs)) { - console.log('Adding webgl.disabled to', browserPrefs); - appendFileSync(browserPrefs, 'user_pref("webgl.disabled", true);'); // apparently Firefox removes duplicates (and sorts), so no problem appending every time -} else { - console.log(browserPrefs, 'does not exist yet, will patch it on next run. Restart the script if you get a captcha.'); -} - // https://playwright.dev/docs/auth#multi-factor-authentication -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { + // channel: 'chrome', // recommended, but `npx patchright install chrome` clashes with system Chrome - https://github.com/Kaliiiiiiiiii-Vinyzu/patchright-nodejs#best-practice----use-chrome-without-fingerprint-injection headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0', // see replace of Headless in util.newStealthContext. TODO Windows UA enough to avoid 'device not supported'? update if browser is updated? - // userAgent firefox (macOS): Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:106.0) Gecko/20100101 Firefox/106.0 - // userAgent firefox (docker): Mozilla/5.0 (X11; Linux aarch64; rv:109.0) Gecko/20100101 Firefox/115.0 - locale: 'en-US', // ignore OS locale to be sure to have english text for locators + // locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/eg-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved - // user settings for firefox have to be put in $BROWSER_DIR/user.js - args: [ // https://wiki.mozilla.org/Firefox/CommandLineOptions - // '-kiosk', + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', ], + chromiumSandbox: true, // https://github.com/Kaliiiiiiiiii-Vinyzu/patchright/issues/52 }); -handleSIGINT(context); +// console.log(context.browser().browserType()); // browser is null... +if (cfg.debug) console.log(chromium.executablePath()); -// Without stealth plugin, the website shows an hcaptcha on login with username/password and in the last step of claiming a game. It may have other heuristics like unsuccessful logins as well. After <6h (TBD) it resets to no captcha again. Getting a new IP also resets. -await stealth(context); +handleSIGINT(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); @@ -150,7 +142,7 @@ try { // debug showed that in those cases the href was still correct, so we `goto` the urls instead of clicking. // Alternative: parse the json loaded to build the page https://store-site-backend-static-ipv4.ak.epicgames.com/freeGamesPromotions // i.e. filter data.Catalog.searchStore.elements for .promotions.promotionalOffers being set and build URL with .catalogNs.mappings[0].pageSlug or .urlSlug if not set to some wrong id like it was the case for spirit-of-the-north-f58a66 - this is also what's done here: https://github.com/claabs/epicgames-freegames-node/blob/938a9653ffd08b8284ea32cf01ac8727d25c5d4c/src/puppet/free-games.ts#L138-L213 - const urlSlugs = await Promise.all((await game_loc.elementHandles()).map(a => a.getAttribute('href'))); + const urlSlugs = await Promise.all((await game_loc.all()).map(a => a.getAttribute('href'))); const urls = urlSlugs.map(s => 'https://store.epicgames.com' + s); console.log('Free games:', urls); diff --git a/package-lock.json b/package-lock.json index 9ab1fff..00d8aaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "fingerprint-injector": "^2.1.66", "lowdb": "^7.0.1", "otplib": "^12.0.1", + "patchright": "^1.52.3", "playwright-firefox": "^1.52.0", "puppeteer-extra-plugin-stealth": "^2.11.2" }, @@ -1386,6 +1387,20 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -2138,6 +2153,36 @@ "node": ">= 0.8" } }, + "node_modules/patchright": { + "version": "1.52.3", + "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.3.tgz", + "integrity": "sha512-hi4MhiUrAFIS0CQH8tcHaRwWIhgK+B9Kz74pp95Mn/MJQHPTGLRYlNiJCxjcfxF3qDNhO1lrxDORKfRPvd45MA==", + "license": "Apache-2.0", + "dependencies": { + "patchright-core": "1.52.3" + }, + "bin": { + "patchright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/patchright-core": { + "version": "1.52.3", + "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.3.tgz", + "integrity": "sha512-vTGjtGGR0VEZPujPd/2Xfq4uFIE1Rrz5pFwApwyrbyPILERLhzRXwR9MwtIQw4infpoPhF4QAd8qisB9znrTMg==", + "license": "Apache-2.0", + "bin": { + "patchright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3786,6 +3831,12 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, "function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -4301,6 +4352,20 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, + "patchright": { + "version": "1.52.3", + "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.3.tgz", + "integrity": "sha512-hi4MhiUrAFIS0CQH8tcHaRwWIhgK+B9Kz74pp95Mn/MJQHPTGLRYlNiJCxjcfxF3qDNhO1lrxDORKfRPvd45MA==", + "requires": { + "fsevents": "2.3.2", + "patchright-core": "1.52.3" + } + }, + "patchright-core": { + "version": "1.52.3", + "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.3.tgz", + "integrity": "sha512-vTGjtGGR0VEZPujPd/2Xfq4uFIE1Rrz5pFwApwyrbyPILERLhzRXwR9MwtIQw4infpoPhF4QAd8qisB9znrTMg==" + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", diff --git a/package.json b/package.json index 0487277..930b9eb 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "fingerprint-injector": "^2.1.66", "lowdb": "^7.0.1", "otplib": "^12.0.1", + "patchright": "^1.52.3", "playwright-firefox": "^1.52.0", "puppeteer-extra-plugin-stealth": "^2.11.2" }, From 1dbbfaf3ad4171667577be247928925f298346d5 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 16 May 2025 02:07:40 +0200 Subject: [PATCH 003/167] lint: fix most super-linter errors --- .github/workflows/docker.yml | 6 +-- CONTRIBUTING.md | 4 +- Dockerfile | 2 +- README.md | 87 +++++++++++++++++++----------------- docker-entrypoint.sh | 8 ++-- 5 files changed, 55 insertions(+), 52 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8c12487..d165560 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,11 +27,11 @@ jobs: - name: Set environment variables run: | - echo "NOW=$(date -R)" >> $GITHUB_ENV # date -Iseconds; date +'%Y-%m-%dT%H:%M:%S' + echo "NOW=$(date -R)" >> "$GITHUB_ENV" # date -Iseconds; date +'%Y-%m-%dT%H:%M:%S' if [[ "$BRANCH" == "main" ]]; then - echo "IMAGE_TAG=latest" >> $GITHUB_ENV + echo "IMAGE_TAG=latest" >> "$GITHUB_ENV" else - echo "IMAGE_TAG=$BRANCH" >> $GITHUB_ENV + echo "IMAGE_TAG=$BRANCH" >> "$GITHUB_ENV" fi - name: Set up QEMU diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aaf8218..630ec97 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contribute ## Building and publishing docker images -Setup the secrets for DOCKERHUB_USERNAME and [DOCKERHUB_TOKEN](https://hub.docker.com/settings/security) in https://github.com/YOUR_USERNAME/free-games-claimer/settings/secrets/actions to be able to run the docker.yml workflows. +Setup the secrets for DOCKERHUB_USERNAME and [DOCKERHUB_TOKEN](https://hub.docker.com/settings/security) in `https://github.com/YOUR_USERNAME/free-games-claimer/settings/secrets/actions` to be able to run the docker.yml workflows. -Check if under Workflow Permissions in https://github.com/YOUR_USERNAME/free-games-claimer/settings/actions the radio button is set to "Read and write permissions". In case that's not set the push to ghcr.io will fail. \ No newline at end of file +Check if under Workflow Permissions in `https://github.com/YOUR_USERNAME/free-games-claimer/settings/actions` the radio button is set to "Read and write permissions", otherwise the push to ghcr.io will fail. diff --git a/Dockerfile b/Dockerfile index a8c5e24..e2f8006 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update \ # RUN npm --version RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html -RUN pip install apprise +RUN pip install --no-cache-dir apprise WORKDIR /fgc COPY package*.json ./ diff --git a/README.md b/README.md index 17ec854..e01cb8a 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ +# free-games-claimer +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=vogler_free-games-claimer&metric=code_smells)](https://sonarcloud.io/project/overview?id=vogler_free-games-claimer) +

logo-free-games-claimer

-[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=vogler_free-games-claimer&metric=code_smells)](https://sonarcloud.io/project/overview?id=vogler_free-games-claimer) -# free-games-claimer - Claims free games periodically on -- [Epic Games Store](https://www.epicgames.com/store/free-games) -- [Amazon Prime Gaming](https://gaming.amazon.com) -- [GOG](https://www.gog.com) -- [Unreal Engine (Assets)](https://www.unrealengine.com/marketplace/en-US/assets?count=20&sortBy=effectiveDate&sortDir=DESC&start=0&tag=4910) ([experimental](https://github.com/vogler/free-games-claimer/issues/44), same login as Epic Games) +- logo epic-games [Epic Games Store](https://www.epicgames.com/store/free-games) +- logo prime-gaming [Amazon Prime Gaming](https://gaming.amazon.com) +- logo gog [GOG](https://www.gog.com) +- logo unrealengine [Unreal Engine (Assets)](https://www.unrealengine.com/marketplace/en-US/assets?count=20&sortBy=effectiveDate&sortDir=DESC&start=0&tag=4910) ([experimental](https://github.com/vogler/free-games-claimer/issues/44), same login as Epic Games) Pull requests welcome :) @@ -22,7 +22,7 @@ Raspberry Pi (3, 4, Zero 2): [requires 64-bit OS](https://github.com/vogler/free ## How to run Easy option: [install Docker](https://docs.docker.com/get-docker/) (or [podman](https://podman-desktop.io/)) and run this command in a terminal: -``` +```sh docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer ``` @@ -48,7 +48,7 @@ If you don't want to use Docker for quasi-headless mode, you could run inside a ## 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. +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). @@ -67,32 +67,32 @@ TODO: ~~On the first run, the script will guide you through configuration and sa 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) | +| 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. | +| 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. @@ -100,7 +100,10 @@ See `src/config.js` for all 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)). +You can pass variables using `-e VAR=VAL`. +For example, `docker run -e EMAIL=foo@bar.baz -e NOTIFY='tgram://bottoken/ChatID' ...`. +Alternatively, you can pass a file with `--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 @@ -143,10 +146,10 @@ Claiming the Amazon Games works out-of-the-box, however, for games on external s ### 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. +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*. +Unreal Engine has new assets to claim _every first Tuesday of a month_. It is safe to run the scripts every day. @@ -176,10 +179,10 @@ If you're a developer, you can use `PWDEBUG=1 ...` to [inspect](https://playwrig 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. +Played around with Puppeteer before, now trying newer [Playwright](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.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. @@ -199,7 +202,7 @@ Renamed repository from epicgames-claimer to free-games-claimer since a script f 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. +[PR](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. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5837164..7aa8772 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -eo pipefail # exit on error, error on any fail in pipe (not just last cmd); add -x to print each cmd; see gist bash_strict_mode.md echo "Version: https://github.com/vogler/free-games-claimer/tree/${COMMIT}" -[ ! -z $BRANCH ] && [ $BRANCH != "main" ] && echo "Branch: ${BRANCH}" +[ -n "$BRANCH" ] && [ "$BRANCH" != "main" ] && echo "Branch: ${BRANCH}" echo "Build: $NOW" # Remove chromium profile lock. @@ -17,7 +17,7 @@ rm -f /fgc/data/browser/SingletonLock mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # echo 'user_pref("privacy.resistFingerprinting", true);' > /fgc/data/browser/user.js -cat << EOT > /fgc/data/browser/user.js +cat << EOT >/fgc/data/browser/user.js user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); @@ -47,9 +47,9 @@ else pw="-passwd $VNC_PASSWORD" pwt="with password" fi -x11vnc -display $DISPLAY -forever -shared -rfbport $VNC_PORT -bg $pw 2>/dev/null 1>&2 +x11vnc -display $DISPLAY -forever -shared -rfbport "$VNC_PORT" -bg "$pw" 2>/dev/null 1>&2 echo "VNC is running on port $VNC_PORT ($pwt)" -websockify -D --web "/usr/share/novnc/" $NOVNC_PORT "localhost:$VNC_PORT" 2>/dev/null 1>&2 & +websockify -D --web "/usr/share/novnc/" "$NOVNC_PORT" "localhost:$VNC_PORT" 2>/dev/null 1>&2 & echo "noVNC (VNC via browser) is running on http://localhost:$NOVNC_PORT" echo exec tini -g -- "$@" # https://github.com/krallin/tini/issues/8 node/playwright respond to signals like ctrl-c, but unsure about zombie processes From 6d9a3ad1400314d80328d82f6551caa567dd0d85 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 16:48:32 +0200 Subject: [PATCH 004/167] fix eslint errors --- aliexpress.js | 54 ++++++++++++----------- epic-games.js | 1 - eslint.config.js | 5 ++- prime-gaming.js | 10 +++-- steam-games.js | 10 ++--- test/sigint-enquirer-raw-keeps-running.js | 4 +- test/sigint-enquirer-raw.js | 26 +++++------ 7 files changed, 59 insertions(+), 51 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index 52e75a0..468301e 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 @@ -88,31 +88,35 @@ const coins = async () => { console.log('Tomorrow:', await page.locator('.addcoin').innerText()); }; -const grow = async () => { - await page.pause(); -}; - -const gogo = async () => { - await page.pause(); -}; - -const euro = async () => { - await page.pause(); -}; - -const merge = async () => { - await page.pause(); -}; +// const grow = async () => { +// await page.pause(); +// }; +// +// const gogo = async () => { +// await page.pause(); +// }; +// +// const euro = async () => { +// await page.pause(); +// }; +// +// const merge = async () => { +// await page.pause(); +// }; try { // await coins(); await [ - // coins, + coins, // grow, // gogo, // euro, - merge, - ].reduce((a, f) => a.then(async _ => { await auth(urls[f.name]); await f(); console.log() }), Promise.resolve()); + // merge, + ].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/epic-games.js b/epic-games.js index 4db1e75..500e6cf 100644 --- a/epic-games.js +++ b/epic-games.js @@ -53,7 +53,6 @@ const page = context.pages().length ? context.pages()[0] : await context.newPage await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it // some debug info about the page (screen dimensions, user agent, platform) -// eslint-disable-next-line no-undef if (cfg.debug) console.debug(await page.evaluate(() => [(({ width, height, availWidth, availHeight }) => ({ width, height, availWidth, availHeight }))(window.screen), navigator.userAgent, navigator.platform, navigator.vendor])); // deconstruct screen needed since `window.screen` prints {}, `window.screen.toString()` '[object Screen]', and can't use some pick function without defining it on `page` if (cfg.debug_network) { // const filter = _ => true; diff --git a/eslint.config.js b/eslint.config.js index 48b1cbc..3b38d56 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -15,7 +15,10 @@ export default [ { // files: ['*.js'], languageOptions: { - globals: globals.node, + globals: { + ...globals.node, + ...globals.browser, + }, }, plugins: { '@stylistic/js': stylistic, diff --git a/prime-gaming.js b/prime-gaming.js index dada15f..9b9c0d5 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -131,6 +131,8 @@ try { // bottom to top: oldest to newest games internal.reverse(); external.reverse(); + // TODO just use async, no need for Promise? -> type error since now Page | bool instead of any + // eslint-disable-next-line no-async-promise-executor const sameOrNewPage = async url => new Promise(async (resolve, _reject) => { const isNew = page.url() != url; let p = page; @@ -145,11 +147,11 @@ try { const [p, isNew] = await sameOrNewPage(url); const dueDateOrg = await p.locator('.availability-date .tw-bold').innerText(); const dueDate = new Date(Date.parse(dueDateOrg + ' 17:00')); - const daysLeft = (dueDate.getTime() - Date.now())/1000/60/60/24; + const daysLeft = (dueDate.getTime() - Date.now()) / 1000 / 60 / 60 / 24; console.log(' ', await p.locator('.availability-date').innerText(), '->', 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) { @@ -300,7 +302,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'); @@ -366,7 +368,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()); 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); // }); From 78621f38a431652f31cbc4c05a50477abef03f8e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 16:53:22 +0200 Subject: [PATCH 005/167] Contributing: how to create a pull request --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 630ec97..91573cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,17 @@ # Contribute +## Code: how to create a pull request + +1. Fork it ( https://github.com/vogler/free-games-claimer/fork ). +1. Create your feature branch (`git checkout -b my-new-feature`). +1. Stage your files (`git add .`). +1. Commit your changes (`git commit -am 'Add some feature'`). +1. Push to the branch (`git push origin my-new-feature`). +1. Create a new pull request ( https://github.com/vogler/free-games-claimer/compare ). + + ## Building and publishing docker images + Setup the secrets for DOCKERHUB_USERNAME and [DOCKERHUB_TOKEN](https://hub.docker.com/settings/security) in `https://github.com/YOUR_USERNAME/free-games-claimer/settings/secrets/actions` to be able to run the docker.yml workflows. Check if under Workflow Permissions in `https://github.com/YOUR_USERNAME/free-games-claimer/settings/actions` the radio button is set to "Read and write permissions", otherwise the push to ghcr.io will fail. From 0e00cfd7fb51f19cd95724caae0c1d49493a083c Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 22:23:57 +0200 Subject: [PATCH 006/167] dependabot: ignore eslint and group devDependencies into one PR --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1b47972..7caefc7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,12 @@ updates: directory: "/" schedule: interval: "weekly" + ignore: + - dependency-name: "*eslint*" + # - dependency-name: "@stylistic/eslint-plugin-js" + groups: + dev-dependencies: + dependency-type: "development" # commit-message: # prefix: "npm" # include: "scope" From 2bd12a986e6d24e414c0fc305057edea8b2eb194 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 22:40:08 +0200 Subject: [PATCH 007/167] pg: fix eslint no-async-promise-executor --- prime-gaming.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index 9b9c0d5..4e1c7aa 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -131,20 +131,18 @@ try { // bottom to top: oldest to newest games internal.reverse(); external.reverse(); - // TODO just use async, no need for Promise? -> type error since now Page | bool instead of any - // eslint-disable-next-line no-async-promise-executor - 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 { p, isNew } = await sameOrNewPage(url); const dueDateOrg = await p.locator('.availability-date .tw-bold').innerText(); const dueDate = new Date(Date.parse(dueDateOrg + ' 17:00')); const daysLeft = (dueDate.getTime() - Date.now()) / 1000 / 60 / 60 / 24; From ada40d05ecbec76b78a9126cf343cb5ccb97c74f Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 23:26:11 +0200 Subject: [PATCH 008/167] docker: use metadata-action for tags and labels https://github.com/docker/metadata-action Packages on GitHub lack description since labels from Dockerfile are not used: https://github.com/vogler/free-games-claimer/pkgs/container/free-games-claimer/421753259 --- .github/workflows/docker.yml | 41 +++++++++++++++++++++++++++--------- Dockerfile | 12 +++++------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d165560..784bb8b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,15 +34,25 @@ jobs: echo "IMAGE_TAG=$BRANCH" >> "$GITHUB_ENV" fi - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + name: Extract metadata for Docker (tags, labels) + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ secrets.DOCKERHUB_USERNAME }}/free-games-claimer + ghcr.io/${{ github.actor }}/free-games-claimer + tags: | + type=ref,event=branch + type=ref,event=pr + # use docker tag 'latest' for the default branch (default is to only use it for the latest git tag) + type=raw,value=latest,enable={{is_default_branch}} + labels: | + org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} - name: Login to Docker Hub uses: docker/login-action@v3 # if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} # does not work: Unrecognized named-value: 'secrets' - https://www.cloudtruth.com/blog/skipping-jobs-in-github-actions-when-secrets-are-unavailable-securely-inject-configuration-secrets-into-github + if: github.event_name != 'pull_request' # don't try to login since PRs don't have access to secrets and need to set them in their fork with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -53,20 +63,31 @@ jobs: registry: ghcr.io username: ${{ github.actor }} # actor is user that opened PR, was repository_owner before password: ${{ secrets.GITHUB_TOKEN }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Build and push uses: docker/build-push-action@v6 if: ${{ env.IMAGE_TAG != '' }} with: context: . - push: ${{ secrets.DOCKERHUB_USERNAME != '' }} + # push: ${{ github.event_name != 'pull_request' }} + push: ${{ secrets.DOCKERHUB_USERNAME != '' }} # here we can access secrets + # TODO speed up by building in parallel? https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners + platforms: linux/amd64,linux/arm64 build-args: | COMMIT=${{ github.sha }} BRANCH=${{ env.BRANCH }} NOW=${{ env.NOW }} - platforms: linux/amd64,linux/arm64 - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/free-games-claimer:${{env.IMAGE_TAG}} - ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + annotations: ${{ steps.meta.outputs.annotations }} + # tags: | + # ${{ secrets.DOCKERHUB_USERNAME }}/free-games-claimer:${{env.IMAGE_TAG}} + # ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/Dockerfile b/Dockerfile index e2f8006..431ec83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,14 +75,14 @@ ENV BRANCH=${BRANCH} ENV NOW=${NOW} LABEL org.opencontainers.image.title="free-games-claimer" \ - org.opencontainers.image.name="free-games-claimer" \ + # org.opencontainers.image.name="free-games-claimer" \ org.opencontainers.image.description="Automatically claims free games on the Epic Games Store, Amazon Prime Gaming and GOG" \ org.opencontainers.image.url="https://github.com/vogler/free-games-claimer" \ - org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" \ - org.opencontainers.image.revision=${COMMIT} \ - org.opencontainers.image.ref.name=${BRANCH} \ - org.opencontainers.image.base.name="ubuntu:jammy" \ - org.opencontainers.image.version="latest" + org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" + # org.opencontainers.image.revision=${COMMIT} \ + # org.opencontainers.image.ref.name=${BRANCH} \ + # org.opencontainers.image.base.name="ubuntu:jammy" \ + # org.opencontainers.image.version="latest" # Configure VNC via environment variables: ENV VNC_PORT 5900 From 5d48716ef12a1f7703dae86004c80a31e93cde7c Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 22 May 2025 23:49:09 +0200 Subject: [PATCH 009/167] docker: GitHub doesn't show labels due to multi-arch image -> add annotation level index --- .github/workflows/docker.yml | 4 ++++ Dockerfile | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 784bb8b..00e8cc4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,6 +48,10 @@ jobs: type=raw,value=latest,enable={{is_default_branch}} labels: | org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + env: + # otherwise labels are not shown on GitHub due to multi-arch image: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images + # https://github.com/docker/metadata-action#annotations + DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/Dockerfile b/Dockerfile index 431ec83..1e85d0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,28 +75,26 @@ ENV BRANCH=${BRANCH} ENV NOW=${NOW} LABEL org.opencontainers.image.title="free-games-claimer" \ - # org.opencontainers.image.name="free-games-claimer" \ org.opencontainers.image.description="Automatically claims free games on the Epic Games Store, Amazon Prime Gaming and GOG" \ org.opencontainers.image.url="https://github.com/vogler/free-games-claimer" \ org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" - # org.opencontainers.image.revision=${COMMIT} \ + # org.opencontainers.image.name="free-games-claimer" \ # org.opencontainers.image.ref.name=${BRANCH} \ # org.opencontainers.image.base.name="ubuntu:jammy" \ - # org.opencontainers.image.version="latest" # Configure VNC via environment variables: -ENV VNC_PORT 5900 -ENV NOVNC_PORT 6080 +ENV VNC_PORT=5900 +ENV NOVNC_PORT=6080 EXPOSE 5900 EXPOSE 6080 # Configure Xvfb via environment variables: -ENV WIDTH 1920 -ENV HEIGHT 1080 -ENV DEPTH 24 +ENV WIDTH=1920 +ENV HEIGHT=1080 +ENV DEPTH=24 # Show browser instead of running headless -ENV SHOW 1 +ENV SHOW=1 # Script to setup display server & VNC is always executed. ENTRYPOINT ["docker-entrypoint.sh"] From 98b001c204f0f64e1eb51da686f22bba1b6a9865 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 23 May 2025 00:04:20 +0200 Subject: [PATCH 010/167] docker: comment out all labels since they're added? --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e85d0c..5f394eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,10 +74,10 @@ ENV COMMIT=${COMMIT} ENV BRANCH=${BRANCH} ENV NOW=${NOW} -LABEL org.opencontainers.image.title="free-games-claimer" \ - org.opencontainers.image.description="Automatically claims free games on the Epic Games Store, Amazon Prime Gaming and GOG" \ - org.opencontainers.image.url="https://github.com/vogler/free-games-claimer" \ - org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" +# added by docker/metadata-action using data from GitHub +# LABEL org.opencontainers.image.title="free-games-claimer" \ +# org.opencontainers.image.url="https://github.com/vogler/free-games-claimer" \ +# org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" # org.opencontainers.image.name="free-games-claimer" \ # org.opencontainers.image.ref.name=${BRANCH} \ # org.opencontainers.image.base.name="ubuntu:jammy" \ From 0b586c5d0ceb5361d8005218ace305eb2b3b272f Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 23 May 2025 00:52:22 +0200 Subject: [PATCH 011/167] docker: rm old labels --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f394eb..1d773bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,9 +78,6 @@ ENV NOW=${NOW} # LABEL org.opencontainers.image.title="free-games-claimer" \ # org.opencontainers.image.url="https://github.com/vogler/free-games-claimer" \ # org.opencontainers.image.source="https://github.com/vogler/free-games-claimer" - # org.opencontainers.image.name="free-games-claimer" \ - # org.opencontainers.image.ref.name=${BRANCH} \ - # org.opencontainers.image.base.name="ubuntu:jammy" \ # Configure VNC via environment variables: ENV VNC_PORT=5900 From 0b27cf0a4477286c689c456ff888d11666be1460 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 23 May 2025 00:54:04 +0200 Subject: [PATCH 012/167] lint.yml -> super-linter.yml --- .github/workflows/{lint.yml => super-linter.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{lint.yml => super-linter.yml} (96%) diff --git a/.github/workflows/lint.yml b/.github/workflows/super-linter.yml similarity index 96% rename from .github/workflows/lint.yml rename to .github/workflows/super-linter.yml index 02ca3cb..d64f370 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/super-linter.yml @@ -1,5 +1,5 @@ # https://github.com/marketplace/actions/super-linter#get-started -name: Lint +name: Super-Linter on: # yamllint disable-line rule:truthy push: null @@ -9,7 +9,7 @@ permissions: {} jobs: lint: - name: Lint + name: Super-Linter runs-on: ubuntu-latest permissions: From 5a9cc0cb3a0b54ae3f5a69b6a038e369299e2814 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 23 May 2025 00:54:32 +0200 Subject: [PATCH 013/167] npx mega-linter-runner --install # all defaults --- .cspell.json | 16 +++ .github/workflows/mega-linter.yml | 195 ++++++++++++++++++++++++++++++ .gitignore | 2 + .jscpd.json | 15 +++ .mega-linter.yml | 24 ++++ 5 files changed, 252 insertions(+) create mode 100644 .cspell.json create mode 100644 .github/workflows/mega-linter.yml create mode 100644 .jscpd.json create mode 100644 .mega-linter.yml diff --git a/.cspell.json b/.cspell.json new file mode 100644 index 0000000..b798d29 --- /dev/null +++ b/.cspell.json @@ -0,0 +1,16 @@ +{ + "ignorePaths": [ + "**/node_modules/**", + "**/vscode-extension/**", + "**/.git/**", + "**/.pnpm-lock.json", + ".vscode", + "megalinter", + "package-lock.json", + "report" + ], + "language": "en", + "noConfigSearch": true, + "words": ["megalinter", "oxsecurity"], + "version": "0.2" +} diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml new file mode 100644 index 0000000..cf0ec1e --- /dev/null +++ b/.github/workflows/mega-linter.yml @@ -0,0 +1,195 @@ +# MegaLinter GitHub Action configuration file +# More info at https://megalinter.io +--- +name: MegaLinter + +# Trigger mega-linter at every push. Action will also be visible from +# Pull Requests to main +on: + # Comment this line to trigger action only on pull-requests + # (not recommended if you don't pay for GH Actions) + push: + + pull_request: + branches: + - main + - master + +# Comment env block if you do not want to apply fixes +env: + # Apply linter fixes configuration + # + # When active, APPLY_FIXES must also be defined as environment variable + # (in github/workflows/mega-linter.yml or other CI tool) + APPLY_FIXES: all + + # Decide which event triggers application of fixes in a commit or a PR + # (pull_request, push, all) + APPLY_FIXES_EVENT: pull_request + + # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) + # or posted in a PR (pull_request) + APPLY_FIXES_MODE: commit + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + megalinter: + name: MegaLinter + runs-on: ubuntu-latest + + # Give the default GITHUB_TOKEN write permission to commit and push, comment + # issues, and post new Pull Requests; remove the ones you do not need + permissions: + contents: write + issues: write + pull-requests: write + + steps: + # Git Checkout + - name: Checkout Code + uses: actions/checkout@v4 + with: + token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} + + # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to + # improve performance + fetch-depth: 0 + + # MegaLinter + - name: MegaLinter + + # You can override MegaLinter flavor used to have faster performances + # More info at https://megalinter.io/latest/flavors/ + uses: oxsecurity/megalinter@v8 + + id: ml + + # All available variables are described in documentation + # https://megalinter.io/latest/config-file/ + env: + # Validates all source when push on main, else just the git diff with + # main. Override with true if you always want to lint all sources + # + # To validate the entire codebase, set to: + # VALIDATE_ALL_CODEBASE: true + # + # To validate only diff with main, set to: + # VALIDATE_ALL_CODEBASE: >- + # ${{ + # github.event_name == 'push' && + # github.ref == 'refs/heads/main' + # }} + VALIDATE_ALL_CODEBASE: true + + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Uncomment to use ApiReporter (Grafana) + # API_REPORTER: true + # API_REPORTER_URL: ${{ secrets.API_REPORTER_URL }} + # API_REPORTER_BASIC_AUTH_USERNAME: ${{ secrets.API_REPORTER_BASIC_AUTH_USERNAME }} + # API_REPORTER_BASIC_AUTH_PASSWORD: ${{ secrets.API_REPORTER_BASIC_AUTH_PASSWORD }} + # API_REPORTER_METRICS_URL: ${{ secrets.API_REPORTER_METRICS_URL }} + # API_REPORTER_METRICS_BASIC_AUTH_USERNAME: ${{ secrets.API_REPORTER_METRICS_BASIC_AUTH_USERNAME }} + # API_REPORTER_METRICS_BASIC_AUTH_PASSWORD: ${{ secrets.API_REPORTER_METRICS_BASIC_AUTH_PASSWORD }} + # API_REPORTER_DEBUG: false + + # ADD YOUR CUSTOM ENV VARIABLES HERE TO OVERRIDE VALUES OF + # .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY + + # Upload MegaLinter artifacts + - name: Archive production artifacts + uses: actions/upload-artifact@v4 + if: success() || failure() + with: + name: MegaLinter reports + include-hidden-files: "true" + path: | + megalinter-reports + mega-linter.log + + # Create pull request if applicable + # (for now works only on PR from same repository, not from forks) + - name: Create Pull Request with applied fixes + uses: peter-evans/create-pull-request@v6 + id: cpr + if: >- + steps.ml.outputs.has_updated_sources == 1 && + ( + env.APPLY_FIXES_EVENT == 'all' || + env.APPLY_FIXES_EVENT == github.event_name + ) && + env.APPLY_FIXES_MODE == 'pull_request' && + ( + github.event_name == 'push' || + github.event.pull_request.head.repo.full_name == github.repository + ) && + !contains(github.event.head_commit.message, 'skip fix') + with: + token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} + commit-message: "[MegaLinter] Apply linters automatic fixes" + title: "[MegaLinter] Apply linters automatic fixes" + labels: bot + + - name: Create PR output + if: >- + steps.ml.outputs.has_updated_sources == 1 && + ( + env.APPLY_FIXES_EVENT == 'all' || + env.APPLY_FIXES_EVENT == github.event_name + ) && + env.APPLY_FIXES_MODE == 'pull_request' && + ( + github.event_name == 'push' || + github.event.pull_request.head.repo.full_name == github.repository + ) && + !contains(github.event.head_commit.message, 'skip fix') + run: | + echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}" + echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}" + + # Push new commit if applicable + # (for now works only on PR from same repository, not from forks) + - name: Prepare commit + if: >- + steps.ml.outputs.has_updated_sources == 1 && + ( + env.APPLY_FIXES_EVENT == 'all' || + env.APPLY_FIXES_EVENT == github.event_name + ) && + env.APPLY_FIXES_MODE == 'commit' && + github.ref != 'refs/heads/main' && + ( + github.event_name == 'push' || + github.event.pull_request.head.repo.full_name == github.repository + ) && + !contains(github.event.head_commit.message, 'skip fix') + run: sudo chown -Rc $UID .git/ + + - name: Commit and push applied linter fixes + uses: stefanzweifel/git-auto-commit-action@v5 + if: >- + steps.ml.outputs.has_updated_sources == 1 && + ( + env.APPLY_FIXES_EVENT == 'all' || + env.APPLY_FIXES_EVENT == github.event_name + ) && + env.APPLY_FIXES_MODE == 'commit' && + github.ref != 'refs/heads/main' && + ( + github.event_name == 'push' || + github.event.pull_request.head.repo.full_name == github.repository + ) && + !contains(github.event.head_commit.message, 'skip fix') + with: + branch: >- + ${{ + github.event.pull_request.head.ref || + github.head_ref || + github.ref + }} + commit_message: "[MegaLinter] Apply linters fixes" + commit_user_name: megalinter-bot + commit_user_email: 129584137+megalinter-bot@users.noreply.github.com diff --git a/.gitignore b/.gitignore index 7983ad4..e950054 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ node_modules/ data/ *.env + +megalinter-reports/ diff --git a/.jscpd.json b/.jscpd.json new file mode 100644 index 0000000..2cee5f5 --- /dev/null +++ b/.jscpd.json @@ -0,0 +1,15 @@ +{ + "threshold": 0, + "reporters": ["html", "markdown"], + "ignore": [ + "**/node_modules/**", + "**/.git/**", + "**/.rbenv/**", + "**/.venv/**", + "**/*cache*/**", + "**/.github/**", + "**/.idea/**", + "**/report/**", + "**/*.svg" + ] +} diff --git a/.mega-linter.yml b/.mega-linter.yml new file mode 100644 index 0000000..411be48 --- /dev/null +++ b/.mega-linter.yml @@ -0,0 +1,24 @@ +# Configuration file for MegaLinter +# +# See all available variables at https://megalinter.io/latest/config-file/ and in +# linters documentation + +# all, none, or list of linter keys +APPLY_FIXES: all + +# If you use ENABLE variable, all other languages/formats/tooling-formats will +# be disabled by default +# ENABLE: + +# If you use ENABLE_LINTERS variable, all other linters will be disabled by +# default +# ENABLE_LINTERS: + +# DISABLE: + # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes + # - SPELL # Uncomment to disable checks of spelling mistakes + +SHOW_ELAPSED_TIME: true + +# Uncomment if you want MegaLinter to detect errors but not block CI to pass +# DISABLE_ERRORS: true From 847c921bcaffbf889d9c87a029434a67fdfbeb11 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:32:45 +0200 Subject: [PATCH 014/167] use megalinter cupcake flavor (88 vs 127 linter, 5 vs 10GB image) --- .github/workflows/mega-linter.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index cf0ec1e..d6492e5 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -63,7 +63,8 @@ jobs: # You can override MegaLinter flavor used to have faster performances # More info at https://megalinter.io/latest/flavors/ - uses: oxsecurity/megalinter@v8 + # uses: oxsecurity/megalinter@v8 # default (127 linters) + uses: oxsecurity/megalinter/flavors/cupcake@v8.7.0 # most common, was recommended in output (88 linters) id: ml From 91fe3aee8065a4efc2159a7badadeb11d8abae08 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:33:05 +0200 Subject: [PATCH 015/167] run for PRs against main or dev --- .github/workflows/mega-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index d6492e5..e6d7394 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -13,7 +13,7 @@ on: pull_request: branches: - main - - master + - dev # Comment env block if you do not want to apply fixes env: From 0495486cde6f37c56bed12dab7235ab08e672f2c Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:33:19 +0200 Subject: [PATCH 016/167] comment how to run locally --- .github/workflows/mega-linter.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index e6d7394..7dcbe30 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -1,5 +1,9 @@ # MegaLinter GitHub Action configuration file # More info at https://megalinter.io +# Run this locally via Docker: +# npx mega-linter-runner -r v8 -f cupcake # run as configured in .mega-linter +# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE=MARKDOWN,YAML" -e "APPLY_FIXES=none" # only enable certain groups and disable automatic fixes +# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter --- name: MegaLinter From 0c5387729dd494d6c4c16c4f2a191b9f95e741eb Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:33:41 +0200 Subject: [PATCH 017/167] markdown config --- .mega-linter.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.mega-linter.yml b/.mega-linter.yml index 411be48..8dfc5c4 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -22,3 +22,17 @@ SHOW_ELAPSED_TIME: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass # DISABLE_ERRORS: true + +# --- +# Custom config: + +# PRINT_ALPACA: false + +# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter locally +DISABLE_LINTERS: + - MARKDOWN_MARKDOWN_LINK_CHECK # took 32s and only reported 0 (e.g. for localhost) or 403 (forbidden) for working links to settings or due to DDoS/bot protections + +# DISABLE_ERRORS_LINTERS: # error -> warning +# - MARKDOWN_MARKDOWN_LINK_CHECK + +# DISABLE_LINTERS: JAVASCRIPT_STANDARD From 6bd742351f20d082b3c7bb14f6a5ce1074f54165 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:34:00 +0200 Subject: [PATCH 018/167] megalinter markdown --- CONTRIBUTING.md | 12 +++++------ README.md | 54 ++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 91573cc..1e3b262 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,12 +2,12 @@ ## Code: how to create a pull request -1. Fork it ( https://github.com/vogler/free-games-claimer/fork ). -1. Create your feature branch (`git checkout -b my-new-feature`). -1. Stage your files (`git add .`). -1. Commit your changes (`git commit -am 'Add some feature'`). -1. Push to the branch (`git push origin my-new-feature`). -1. Create a new pull request ( https://github.com/vogler/free-games-claimer/compare ). +1. Fork it ( ). +1. Create your feature branch (`git checkout -b my-new-feature`). +1. Stage your files (`git add .`). +1. Commit your changes (`git commit -am 'Add some feature'`). +1. Push to the branch (`git push origin my-new-feature`). +1. Create a new pull request ( ). ## Building and publishing docker images diff --git a/README.md b/README.md index e01cb8a..75d6d94 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ If you don't want to use Docker for quasi-headless mode, you could run inside a ## 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 inside Docker, the browser will be shown only inside the container. You can open 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. @@ -67,32 +67,32 @@ TODO: ~~On the first run, the script will guide you through configuration and sa 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. | -| 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). | +| 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. | +| 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. From ec3db19fb56c047b3bfa16a3af61439b81754ef2 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:38:27 +0200 Subject: [PATCH 019/167] megalinter yaml (funny that this complains about their own generated config...) --- .github/workflows/docker.yml | 30 +++++++++-------------- .github/workflows/sonar.yml | 46 ++++++++++++++++-------------------- .mega-linter.yml | 4 ++-- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 00e8cc4..2e54853 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,8 +5,8 @@ on: push: # push on branch branches: [main, dev] paths: # ignore changes to .md files - - '**' - - '!*.md' + - "**" + - "!*.md" # - '!.github/**' pull_request: # runs when opened/reopned or when the head branch is updated @@ -15,17 +15,15 @@ permissions: packages: write env: - BRANCH: ${{ github.head_ref || github.ref_name }} # head_ref/base_ref are only set for PRs, for branches ref_name will be used + BRANCH: ${{ github.head_ref || github.ref_name }} # head_ref/base_ref are only set for PRs, for branches ref_name will be used jobs: docker: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v4 - - - name: Set environment variables + - name: Set environment variables run: | echo "NOW=$(date -R)" >> "$GITHUB_ENV" # date -Iseconds; date +'%Y-%m-%dT%H:%M:%S' if [[ "$BRANCH" == "main" ]]; then @@ -33,8 +31,7 @@ jobs: else echo "IMAGE_TAG=$BRANCH" >> "$GITHUB_ENV" fi - - - name: Extract metadata for Docker (tags, labels) + - name: Extract metadata for Docker (tags, labels) id: meta uses: docker/metadata-action@v5 with: @@ -52,29 +49,24 @@ jobs: # otherwise labels are not shown on GitHub due to multi-arch image: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images # https://github.com/docker/metadata-action#annotations DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v3 # if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} # does not work: Unrecognized named-value: 'secrets' - https://www.cloudtruth.com/blog/skipping-jobs-in-github-actions-when-secrets-are-unavailable-securely-inject-configuration-secrets-into-github if: github.event_name != 'pull_request' # don't try to login since PRs don't have access to secrets and need to set them in their fork with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} # actor is user that opened PR, was repository_owner before password: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v6 if: ${{ env.IMAGE_TAG != '' }} with: diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 29f81c6..41ae4de 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -6,7 +6,7 @@ on: branches: - main pull_request: - types: [opened, synchronize, reopened] + types: [opened, synchronize, reopened] permissions: contents: read @@ -15,28 +15,22 @@ jobs: sonarcloud: runs-on: ubuntu-latest steps: - - - uses: actions/checkout@v4 - with: - # Disabling shallow clone is recommended for improving relevancy of reporting. Otherwise sonarcloud will show a warning. - fetch-depth: 0 - - - uses: actions/setup-node@v4 - with: - cache: 'npm' - - - name: Install dev dependencies which includde ESLint + plugins - run: npm install --only=dev - - - name: Run ESLint - continue-on-error: true - run: npx eslint . -f json -o eslint_report.json - - - name: Fix ESLint paths - run: sed -i 's+/home/runner/work/free-games-claimer/free-games-claimer+/github/workspace+g' eslint_report.json - - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - uses: actions/checkout@v4 + with: + # Disabling shallow clone is recommended for improving relevancy of reporting. Otherwise sonarcloud will show a warning. + fetch-depth: 0 + - uses: actions/setup-node@v4 + with: + cache: "npm" + - name: Install dev dependencies which includde ESLint + plugins + run: npm install --only=dev + - name: Run ESLint + continue-on-error: true + run: npx eslint . -f json -o eslint_report.json + - name: Fix ESLint paths + run: sed -i 's+/home/runner/work/free-games-claimer/free-games-claimer+/github/workspace+g' eslint_report.json + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.mega-linter.yml b/.mega-linter.yml index 8dfc5c4..50e7e9c 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -15,8 +15,8 @@ APPLY_FIXES: all # ENABLE_LINTERS: # DISABLE: - # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes - # - SPELL # Uncomment to disable checks of spelling mistakes +# - COPYPASTE # Uncomment to disable checks of excessive copy-pastes +# - SPELL # Uncomment to disable checks of spelling mistakes SHOW_ELAPSED_TIME: true From af406b3b50aea1174bccbdfb292ba2ca5f5e3686 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:39:59 +0200 Subject: [PATCH 020/167] megalinter yaml: fix wrong auto-fix --- .mega-linter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index 50e7e9c..a5186a4 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -15,8 +15,8 @@ APPLY_FIXES: all # ENABLE_LINTERS: # DISABLE: -# - COPYPASTE # Uncomment to disable checks of excessive copy-pastes -# - SPELL # Uncomment to disable checks of spelling mistakes +# - COPYPASTE # Uncomment to disable checks of excessive copy-pastes +# - SPELL # Uncomment to disable checks of spelling mistakes SHOW_ELAPSED_TIME: true From a040108e92f3190df21d7f6446c9bcd0c509d165 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:50:08 +0200 Subject: [PATCH 021/167] megalinter "''" needed for lists in env var --- .github/workflows/mega-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 7dcbe30..77e17fa 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -2,7 +2,7 @@ # More info at https://megalinter.io # Run this locally via Docker: # npx mega-linter-runner -r v8 -f cupcake # run as configured in .mega-linter -# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE=MARKDOWN,YAML" -e "APPLY_FIXES=none" # only enable certain groups and disable automatic fixes +# npx mega-linter-runner -r v8 -f cupcake -e "'ENABLE=MARKDOWN,YAML'" -e "APPLY_FIXES=none" # only enable certain groups and disable automatic fixes (note that the '' are required for multiple values) # npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter --- name: MegaLinter From a65a0b80a60574359ce12861e23775812202b5e9 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 15:50:25 +0200 Subject: [PATCH 022/167] disable markdownlint line-length --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 75d6d94..91127a0 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ 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. @@ -182,6 +183,7 @@ Tried [epicgames-freebies-claimer](https://github.com/Revadike/epicgames-freebie Played around with Puppeteer before, now trying newer [Playwright](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)). From 76af81de56b5f4119cf2b0b4d3cdbe49222e8085 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 16:02:36 +0200 Subject: [PATCH 023/167] megalinter reports also in json and md instead of just log --- .mega-linter.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mega-linter.yml b/.mega-linter.yml index a5186a4..b9715fe 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -36,3 +36,7 @@ DISABLE_LINTERS: # - MARKDOWN_MARKDOWN_LINK_CHECK # DISABLE_LINTERS: JAVASCRIPT_STANDARD + +# CI will comment on PRs etc., but for running locally (or downloading the results), we want more than the default megalinter-reports/megalinter.log as an overview: +JSON_REPORTER: true # mega-linter-report.json +MARKDOWN_SUMMARY_REPORTER: true # megalinter-report.md From 056494c9dc7448a7ff9130e8a368b2fc42829d2e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 19:41:20 +0200 Subject: [PATCH 024/167] megalinter customize config; local run ~7min... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ```console $ npx mega-linter-runner -r v8 -f cupcake +----SUMMARY----+--------------------------+---------------+-------+-------+--------+----------+--------------+ | Descriptor | Linter | Mode | Files | Fixed | Errors | Warnings | Elapsed time | +---------------+--------------------------+---------------+-------+-------+--------+----------+--------------+ | ✅ ACTION | actionlint | list_of_files | 4 | | 0 | 0 | 3.25s | | ✅ BASH | bash-exec | file | 1 | | 0 | 0 | 2.77s | | ✅ BASH | shellcheck | list_of_files | 1 | | 0 | 0 | 1.16s | | ✅ BASH | shfmt | list_of_files | 1 | 0 | 0 | 0 | 0.6s | | ⚠️ COPYPASTE | jscpd | project | n/a | | 8 | 0 | 24.82s | | ⚠️ DOCKERFILE | hadolint | list_of_files | 1 | | 4 | 0 | 6.74s | | ⚠️ JAVASCRIPT | eslint | list_of_files | 15 | 0 | 1 | 0 | 11.04s | | ✅ JSON | jsonlint | list_of_files | 7 | | 0 | 0 | 4.76s | | ✅ JSON | npm-package-json-lint | project | n/a | | 0 | 0 | 3.26s | | ✅ JSON | prettier | list_of_files | 7 | 0 | 0 | 0 | 5.08s | | ✅ JSON | v8r | list_of_files | 7 | | 0 | 0 | 47.96s | | ✅ MARKDOWN | markdownlint | list_of_files | 2 | 0 | 0 | 0 | 12.16s | | ✅ MARKDOWN | markdown-table-formatter | list_of_files | 2 | 0 | 0 | 0 | 4.15s | | ⚠️ REPOSITORY | checkov | project | n/a | | 3 | 0 | 112.11s | | ✅ REPOSITORY | gitleaks | project | n/a | | 0 | 0 | 3.09s | | ✅ REPOSITORY | git_diff | project | n/a | | 0 | 0 | 1.22s | | ✅ REPOSITORY | grype | project | n/a | | 0 | 0 | 159.7s | | ⚠️ REPOSITORY | kics | project | n/a | | 24 | 0 | 14.82s | | ✅ REPOSITORY | secretlint | project | n/a | | 0 | 0 | 7.24s | | ✅ REPOSITORY | syft | project | n/a | | 0 | 0 | 7.83s | | ⚠️ REPOSITORY | trivy | project | n/a | | 2 | 0 | 28.16s | | ✅ REPOSITORY | trufflehog | project | n/a | | 0 | 0 | 26.51s | | ⚠️ SPELL | cspell | list_of_files | 40 | | 224 | 0 | 82.25s | | ⚠️ SPELL | lychee | list_of_files | 17 | | 9 | 0 | 10.28s | | ✅ YAML | prettier | list_of_files | 8 | 1 | 0 | 0 | 9.12s | | ✅ YAML | v8r | list_of_files | 8 | | 0 | 0 | 39.07s | | ✅ YAML | yamllint | list_of_files | 8 | | 0 | 0 | 5.39s | +---------------+--------------------------+---------------+-------+-------+--------+----------+--------------+ ``` --- .cspell.json | 6 +++- .github/renovate.json | 4 +-- .github/workflows/docker.yml | 2 +- .github/workflows/mega-linter.yml | 13 +++++--- .mega-linter.yml | 54 +++++++++++++++++++++++++++---- .vscode/settings.json | 2 +- README.md | 2 +- docker-entrypoint.sh | 10 +++--- eslint.config.js | 2 +- jsconfig.json | 2 +- 10 files changed, 73 insertions(+), 24 deletions(-) diff --git a/.cspell.json b/.cspell.json index b798d29..448ffd9 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,5 +1,9 @@ { "ignorePaths": [ + "**/data/**", + "docker.yml", + "Dockerfile", + ".jscpd.json", "**/node_modules/**", "**/vscode-extension/**", "**/.git/**", @@ -11,6 +15,6 @@ ], "language": "en", "noConfigSearch": true, - "words": ["megalinter", "oxsecurity"], + "words": ["megalinter", "oxsecurity", "ralf", "vogler", "DOCKERHUB"], "version": "0.2" } diff --git a/.github/renovate.json b/.github/renovate.json index ecfd5ff..65b4538 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,7 +1,5 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "enabled": false, - "extends": [ - "config:recommended" - ] + "extends": ["config:recommended"] } diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2e54853..4c1e6ba 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,7 +8,7 @@ on: - "**" - "!*.md" # - '!.github/**' - pull_request: # runs when opened/reopned or when the head branch is updated + pull_request: # runs when opened/reopened or when the head branch is updated permissions: contents: read diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 77e17fa..634b2f6 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -1,9 +1,7 @@ # MegaLinter GitHub Action configuration file # More info at https://megalinter.io -# Run this locally via Docker: -# npx mega-linter-runner -r v8 -f cupcake # run as configured in .mega-linter -# npx mega-linter-runner -r v8 -f cupcake -e "'ENABLE=MARKDOWN,YAML'" -e "APPLY_FIXES=none" # only enable certain groups and disable automatic fixes (note that the '' are required for multiple values) -# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter + +# See .mega-linter.yml for actual config and examples how to run this locally. --- name: MegaLinter @@ -198,3 +196,10 @@ jobs: commit_message: "[MegaLinter] Apply linters fixes" commit_user_name: megalinter-bot commit_user_email: 129584137+megalinter-bot@users.noreply.github.com + + # https://megalinter.io/latest/reporters/SarifReporter/ + - name: Upload MegaLinter scan results to GitHub Security tab + if: success() || failure() + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: "megalinter-reports/megalinter-report.sarif" diff --git a/.mega-linter.yml b/.mega-linter.yml index b9715fe..6a84d7d 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -3,6 +3,14 @@ # See all available variables at https://megalinter.io/latest/config-file/ and in # linters documentation +# See .github/workflows/mega-linter.yml for GitHub config. + +# Run this locally via Docker: +# npx mega-linter-runner -r v8 -f cupcake # run as configured here +# npx mega-linter-runner -r v8 -f cupcake -e "'ENABLE=MARKDOWN,YAML'" -e "APPLY_FIXES=none" # only enable certain groups and disable automatic fixes (note that the '' are required for multiple values) +# npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter +# https://github.com/oxsecurity/megalinter#cli-lint-mode most linters will respect .gitignore, but the ones running in 'project' mode will not and may take forever if not configured right + # all, none, or list of linter keys APPLY_FIXES: all @@ -26,17 +34,51 @@ SHOW_ELAPSED_TIME: true # --- # Custom config: -# PRINT_ALPACA: false +PRINT_ALPACA: false + +JAVASCRIPT_DEFAULT_STYLE: prettier # disables JAVASCRIPT_STANDARD in favor of JAVASCRIPT_PRETTIER - disabled below since I prefer my local eslint + +# DISABLE: # groups of linters/formatters +# - REPOSITORY # ignore this for now (at least locally) since all project-based and need extra config like .gitignore # npx mega-linter-runner -r v8 -f cupcake -e "ENABLE_LINTERS=MARKDOWN_MARKDOWN_LINK_CHECK" # run a specific linter locally -DISABLE_LINTERS: - - MARKDOWN_MARKDOWN_LINK_CHECK # took 32s and only reported 0 (e.g. for localhost) or 403 (forbidden) for working links to settings or due to DDoS/bot protections +DISABLE_LINTERS: # times are for running locally with 30GB swap, 65% pressure and several GB in data/ (relevant for project-mode linters that don't respect .gitignore) + - MARKDOWN_MARKDOWN_LINK_CHECK # 30s, only reported 0 (e.g. for localhost) or 403 (forbidden) for working links to settings or due to DDoS/bot protections + - JAVASCRIPT_STANDARD # don't like standard format + - JAVASCRIPT_PRETTIER # prefer my local eslint config + - REPOSITORY_TRIVY_SBOM # 11s, don't need SBOM -# DISABLE_ERRORS_LINTERS: # error -> warning -# - MARKDOWN_MARKDOWN_LINK_CHECK +DISABLE_ERRORS_LINTERS: # error -> warning + - DOCKERFILE_HADOLINT # mostly wants to pin versions for apt and pip installs and merge consecutive RUN instructions + - COPYPASTE_JSCPD # default threshold is 0% duplicates -> can make this error once sep. scripts are refactored + - SPELL_CSPELL # needs config in .cspell.json, but looks annoying since it also flags apt packages + - SPELL_LYCHEE # dead link checking, 9/332 errors all false positives (Forbidden etc.) + - JAVASCRIPT_ES # this uses old eslint 8.57.1 instead of local 9.26.0 and complains about stuff that newer version has no problem with + - REPOSITORY_CHECKOV # docker healthcheck not needed for CLI + - REPOSITORY_KICS # wants to pin GitHub Actions to commit sha etc. + - REPOSITORY_TRIVY # docker healthcheck not needed for CLI -# DISABLE_LINTERS: JAVASCRIPT_STANDARD +# Customizations via CLI arguments: + +# https://github.com/prantlf/jsonlint#command-line-interface +JSON_JSONLINT_ARGUMENTS: --comments --trailing-commas --no-duplicate-keys + +# https://prettier.io/docs/options#trailing-commas +# JSON_PRETTIER_ARGUMENTS: --trailing-comma all --parser jsonc # need to change parser too since the default json parser still strips trailing commas +# -> let prettier remove trailing commas since e.g. npm will fail to JSON.parse package.json otherwise... + +# megalinter still expects the old .eslintrc file... https://github.com/oxsecurity/megalinter/issues/3570#issuecomment-2138193684 +JAVASCRIPT_ES_CONFIG_FILE: eslint.config.js +JAVASCRIPT_ES_COMMAND_REMOVE_ARGUMENTS: ["--no-eslintrc"] # not a valid option for eslint with flat config +# worked, but behaved differently than local `npm run lint` and complained about while(true) with break - probably due old version 8.57.1 (same with -r beta) instead of my local 9.26.0 + +# https://github.com/oxsecurity/megalinter#cli-lint-mode +REPOSITORY_SECRETLINT_ARGUMENTS: --secretlintignore .gitignore + +# https://www.checkov.io/2.Basics/CLI%20Command%20Reference.html +REPOSITORY_CHECKOV_ARGUMENTS: --skip-path node_modules --skip-path data # CI will comment on PRs etc., but for running locally (or downloading the results), we want more than the default megalinter-reports/megalinter.log as an overview: JSON_REPORTER: true # mega-linter-report.json MARKDOWN_SUMMARY_REPORTER: true # megalinter-report.md +SARIF_REPORTER: true # mega-linter-report.sarif - results for supported lintes should be shown in GitHub Security tab - https://megalinter.io/latest/reporters/SarifReporter/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 6106b4f..6d08cc1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,5 @@ "source.fixAll.eslint": "explicit" }, "eslint.experimental.useFlatConfig": true, - "eslint.codeActionsOnSave.rules": null, + "eslint.codeActionsOnSave.rules": null } diff --git a/README.md b/README.md index 91127a0..91d0448 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ You can also put options in `data/config.env` which will be loaded by [dotenv](h 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). +You just need to set `NOTIFY` to the notification services you want to use, e.g. `NOTIFY='mailto://myemail@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. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7aa8772..7b321a1 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -17,7 +17,7 @@ rm -f /fgc/data/browser/SingletonLock mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # echo 'user_pref("privacy.resistFingerprinting", true);' > /fgc/data/browser/user.js -cat << EOT >/fgc/data/browser/user.js +cat </fgc/data/browser/user.js user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); @@ -41,11 +41,11 @@ export DISPLAY=:1 # need to export this, otherwise playwright complains with 'Lo Xvfb $DISPLAY -ac -screen 0 "${WIDTH}x${HEIGHT}x${DEPTH}" & echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT}" if [ -z "$VNC_PASSWORD" ]; then - pw="-nopw" - pwt="no password!" + pw="-nopw" + pwt="no password!" else - pw="-passwd $VNC_PASSWORD" - pwt="with password" + pw="-passwd $VNC_PASSWORD" + pwt="with password" fi x11vnc -display $DISPLAY -forever -shared -rfbport "$VNC_PORT" -bg "$pw" 2>/dev/null 1>&2 echo "VNC is running on port $VNC_PORT ($pwt)" diff --git a/eslint.config.js b/eslint.config.js index 3b38d56..490632f 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -9,7 +9,7 @@ export default [ // object with just `ignores` applies to all configuration objects // had `ln -s .gitignore .eslintignore` before, but .eslintignore no longer supported { - ignores: ['data/**'], + ignores: ['data/**', 'megalinter-reports/**'], }, js.configs.recommended, // TODO still needed? { diff --git a/jsconfig.json b/jsconfig.json index 2e21de9..99aa800 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -3,7 +3,7 @@ "checkJs": true, "target": "es2021", "module": "NodeNext", - "moduleResolution": "NodeNext", // https://github.com/typicode/lowdb/issues/554 + "moduleResolution": "NodeNext" // https://github.com/typicode/lowdb/issues/554 }, "exclude": ["node_modules", "**/node_modules"] } From 6309fc5a37341969509cbe21b47637d70d4b1647 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 19:55:10 +0200 Subject: [PATCH 025/167] megalinter: upload-sarif needs more permissons? https://github.com/github/codeql-action/issues/1806 --- .github/workflows/mega-linter.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 634b2f6..d597ff0 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -48,6 +48,7 @@ jobs: contents: write issues: write pull-requests: write + security-events: write # needed for SARIF upload steps: # Git Checkout @@ -200,6 +201,6 @@ jobs: # https://megalinter.io/latest/reporters/SarifReporter/ - name: Upload MegaLinter scan results to GitHub Security tab if: success() || failure() - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: "megalinter-reports/megalinter-report.sarif" From 1ed84a0a60ff0719bf42c9124d6c7d65f61b02f6 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 20:51:50 +0200 Subject: [PATCH 026/167] megalinter: upload-sarif category --- .github/workflows/mega-linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index d597ff0..154c0f0 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -204,3 +204,4 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: "megalinter-reports/megalinter-report.sarif" + category: mega-linter From 9fa9325566d96dc5d36783b217cc3ffcb8404a00 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 20:52:51 +0200 Subject: [PATCH 027/167] megalinter: job summary from markdown file --- .github/workflows/mega-linter.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 154c0f0..ba1b5a5 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -205,3 +205,11 @@ jobs: with: sarif_file: "megalinter-reports/megalinter-report.sarif" category: mega-linter + + # https://github.blog/news-insights/product-news/supercharging-github-actions-with-job-summaries/ + - name: Add job summary + if: success() || failure() + run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" + + # logs and artifacts are retained for 90 days, workflow run history is retained for 400 days... https://docs.github.com/en/actions/administering-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy + From b4123e5e1dc5d17eb74d6b260342f05aa4347afe Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 21:21:23 +0200 Subject: [PATCH 028/167] remove super-linter in favor of mega-linter --- .github/workflows/super-linter.yml | 36 ------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/super-linter.yml diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml deleted file mode 100644 index d64f370..0000000 --- a/.github/workflows/super-linter.yml +++ /dev/null @@ -1,36 +0,0 @@ -# https://github.com/marketplace/actions/super-linter#get-started -name: Super-Linter - -on: # yamllint disable-line rule:truthy - push: null - pull_request: null - -permissions: {} - -jobs: - lint: - name: Super-Linter - runs-on: ubuntu-latest - - permissions: - contents: read - packages: read - # To report GitHub Actions status checks - statuses: write - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - # super-linter needs the full git history to get the - # list of files that changed across commits - fetch-depth: 0 - - - name: Super-linter - uses: super-linter/super-linter/slim@v7.4.0 # x-release-please-version - # TODO need to create problem matchers for each linter? https://github.com/rhysd/actionlint/blob/v1.7.7/docs/usage.md#problem-matchers - env: - # To report GitHub Actions status checks - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # TODO automatically fix linting issues and commit them for PRs - # fix-lint-issues: # https://github.com/marketplace/actions/super-linter#github-actions-workflow-example-pull-request From e7a00d7d1816fecbebe5d76944cd601cc1b3e641 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 21:51:53 +0200 Subject: [PATCH 029/167] megalinter apparently can't push commit fixing workflows without a sep. PAT See https://github.com/orgs/community/discussions/26711 --- .github/workflows/mega-linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index ba1b5a5..aeff9c0 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -49,6 +49,7 @@ jobs: issues: write pull-requests: write security-events: write # needed for SARIF upload + actions: write # needed to commit fixes for workflows? steps: # Git Checkout From a7b882f3a1b8637b721b1ae5c619dace6a5a179e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 22:22:36 +0200 Subject: [PATCH 030/167] added PAT for megalinter with workflows permission https://github.com/orgs/community/discussions/35410 --- .github/workflows/mega-linter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index aeff9c0..ba1b5a5 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -49,7 +49,6 @@ jobs: issues: write pull-requests: write security-events: write # needed for SARIF upload - actions: write # needed to commit fixes for workflows? steps: # Git Checkout From 5f1458413d4d0d559ef5eda2c35a06a27bf8e344 Mon Sep 17 00:00:00 2001 From: vogler <493741+vogler@users.noreply.github.com> Date: Sat, 24 May 2025 20:25:18 +0000 Subject: [PATCH 031/167] [MegaLinter] Apply linters fixes --- .github/workflows/mega-linter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index ba1b5a5..5f1c176 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -212,4 +212,3 @@ jobs: run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" # logs and artifacts are retained for 90 days, workflow run history is retained for 400 days... https://docs.github.com/en/actions/administering-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy - From 02005b6fee89bf556ec20dc7498887b3c35e7c42 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 22:40:22 +0200 Subject: [PATCH 032/167] skip docker push for PRs --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4c1e6ba..ae78582 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -71,8 +71,8 @@ jobs: if: ${{ env.IMAGE_TAG != '' }} with: context: . - # push: ${{ github.event_name != 'pull_request' }} - push: ${{ secrets.DOCKERHUB_USERNAME != '' }} # here we can access secrets + push: ${{ github.event_name != 'pull_request' }} + # push: ${{ secrets.DOCKERHUB_USERNAME != '' }} # here we can access secrets # TODO speed up by building in parallel? https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners platforms: linux/amd64,linux/arm64 build-args: | From a242b2d5c4d1ef7ac93e71fceb3f0bbb6a7dd5f7 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 22:47:08 +0200 Subject: [PATCH 033/167] ncu -u; migrate @stylistic/eslint-plugin{-js,} https://eslint.style/guide/migration --- eslint.config.js | 96 +- package-lock.json | 2123 +++++++++++++-------------------------------- package.json | 4 +- 3 files changed, 673 insertions(+), 1550 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 490632f..6b0c640 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -2,7 +2,7 @@ // https://eslint.org/docs/latest/use/configure/migration-guide import js from '@eslint/js'; import globals from 'globals'; -import stylistic from '@stylistic/eslint-plugin-js'; +import stylistic from '@stylistic/eslint-plugin'; export default [ // https://eslint.org/docs/latest/use/configure/configuration-files-new#globally-ignoring-files-with-ignores @@ -21,59 +21,59 @@ export default [ }, }, plugins: { - '@stylistic/js': stylistic, + '@stylistic': stylistic, }, // https://eslint.org/docs/latest/rules/ // https://eslint.style/packages/js rules: { 'no-unused-vars': ['error', { argsIgnorePattern: '^_' }], 'prefer-const': 'error', - '@stylistic/js/array-bracket-newline': ['error', 'consistent'], - '@stylistic/js/array-bracket-spacing': 'error', - '@stylistic/js/array-element-newline': ['error', 'consistent'], - '@stylistic/js/arrow-parens': ['error', 'as-needed'], - '@stylistic/js/arrow-spacing': 'error', - '@stylistic/js/block-spacing': 'error', - '@stylistic/js/brace-style': 'error', - '@stylistic/js/comma-dangle': ['error', 'always-multiline'], - '@stylistic/js/comma-spacing': 'error', - '@stylistic/js/comma-style': 'error', - '@stylistic/js/eol-last': 'error', - '@stylistic/js/func-call-spacing': 'error', - '@stylistic/js/function-paren-newline': ['error', 'consistent'], - '@stylistic/js/implicit-arrow-linebreak': 'error', - '@stylistic/js/indent': ['error', 2], - '@stylistic/js/key-spacing': 'error', - '@stylistic/js/keyword-spacing': 'error', - '@stylistic/js/linebreak-style': 'error', - '@stylistic/js/no-extra-parens': 'error', - '@stylistic/js/no-extra-semi': 'error', - '@stylistic/js/no-mixed-spaces-and-tabs': 'error', - '@stylistic/js/no-multi-spaces': 'error', - '@stylistic/js/no-multiple-empty-lines': 'error', - '@stylistic/js/no-tabs': 'error', - '@stylistic/js/no-trailing-spaces': 'error', - '@stylistic/js/no-whitespace-before-property': 'error', - '@stylistic/js/nonblock-statement-body-position': 'error', - '@stylistic/js/object-curly-newline': 'error', - '@stylistic/js/object-curly-spacing': ['error', 'always'], - '@stylistic/js/object-property-newline': ['error', { allowAllPropertiesOnSameLine: true }], - '@stylistic/js/quote-props': ['error', 'as-needed'], - '@stylistic/js/quotes': ['error', 'single'], - '@stylistic/js/rest-spread-spacing': 'error', - '@stylistic/js/semi': 'error', - '@stylistic/js/semi-spacing': 'error', - '@stylistic/js/semi-style': 'error', - '@stylistic/js/space-before-blocks': 'error', - '@stylistic/js/space-before-function-paren': ['error', { anonymous: 'never', named: 'never', asyncArrow: 'always' }], - '@stylistic/js/space-in-parens': 'error', - '@stylistic/js/space-infix-ops': 'error', - '@stylistic/js/space-unary-ops': 'error', - '@stylistic/js/spaced-comment': 'error', - '@stylistic/js/switch-colon-spacing': 'error', - '@stylistic/js/template-curly-spacing': 'error', - '@stylistic/js/template-tag-spacing': 'error', - '@stylistic/js/wrap-regex': 'error', + '@stylistic/array-bracket-newline': ['error', 'consistent'], + '@stylistic/array-bracket-spacing': 'error', + '@stylistic/array-element-newline': ['error', 'consistent'], + '@stylistic/arrow-parens': ['error', 'as-needed'], + '@stylistic/arrow-spacing': 'error', + '@stylistic/block-spacing': 'error', + '@stylistic/brace-style': 'error', + '@stylistic/comma-dangle': ['error', 'always-multiline'], + '@stylistic/comma-spacing': 'error', + '@stylistic/comma-style': 'error', + '@stylistic/eol-last': 'error', + '@stylistic/func-call-spacing': 'error', + '@stylistic/function-paren-newline': ['error', 'consistent'], + '@stylistic/implicit-arrow-linebreak': 'error', + '@stylistic/indent': ['error', 2], + '@stylistic/key-spacing': 'error', + '@stylistic/keyword-spacing': 'error', + '@stylistic/linebreak-style': 'error', + '@stylistic/no-extra-parens': 'error', + '@stylistic/no-extra-semi': 'error', + '@stylistic/no-mixed-spaces-and-tabs': 'error', + '@stylistic/no-multi-spaces': 'error', + '@stylistic/no-multiple-empty-lines': 'error', + '@stylistic/no-tabs': 'error', + '@stylistic/no-trailing-spaces': 'error', + '@stylistic/no-whitespace-before-property': 'error', + '@stylistic/nonblock-statement-body-position': 'error', + '@stylistic/object-curly-newline': 'error', + '@stylistic/object-curly-spacing': ['error', 'always'], + '@stylistic/object-property-newline': ['error', { allowAllPropertiesOnSameLine: true }], + '@stylistic/quote-props': ['error', 'as-needed'], + '@stylistic/quotes': ['error', 'single'], + '@stylistic/rest-spread-spacing': 'error', + '@stylistic/semi': 'error', + '@stylistic/semi-spacing': 'error', + '@stylistic/semi-style': 'error', + '@stylistic/space-before-blocks': 'error', + '@stylistic/space-before-function-paren': ['error', { anonymous: 'never', named: 'never', asyncArrow: 'always' }], + '@stylistic/space-in-parens': 'error', + '@stylistic/space-infix-ops': 'error', + '@stylistic/space-unary-ops': 'error', + '@stylistic/spaced-comment': 'error', + '@stylistic/switch-colon-spacing': 'error', + '@stylistic/template-curly-spacing': 'error', + '@stylistic/template-tag-spacing': 'error', + '@stylistic/wrap-regex': 'error', }, }, ]; diff --git a/package-lock.json b/package-lock.json index 9ab1fff..438578e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,8 +20,8 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { - "@stylistic/eslint-plugin-js": "^4.2.0", - "eslint": "^9.26.0" + "@stylistic/eslint-plugin": "^4.4.0", + "eslint": "^9.27.0" }, "engines": { "node": ">=17" @@ -37,16 +37,20 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", "dev": true, + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -86,9 +90,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", + "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -123,13 +127,16 @@ } }, "node_modules/@eslint/js": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", - "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", + "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { @@ -143,13 +150,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", - "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", + "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "levn": "^0.4.1" }, "engines": { @@ -205,26 +212,42 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.3.tgz", - "integrity": "sha512-rmOWVRUbUJD7iSvJugjUbFZshTAuJ48MXoZ80Osx1GM0K/H1w7rSEvmw8m6vdWxNASgtaHIhAgre4H/E9GJiYQ==", + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "license": "MIT", "dependencies": { - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.5", - "eventsource": "^3.0.2", - "express": "^5.0.1", - "express-rate-limit": "^7.5.0", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.23.8", - "zod-to-json-schema": "^3.24.1" + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" }, "engines": { - "node": ">=18" + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" } }, "node_modules/@otplib/core": { @@ -281,14 +304,18 @@ "url": "https://github.com/sindresorhus/is?sponsor=1" } }, - "node_modules/@stylistic/eslint-plugin-js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz", - "integrity": "sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==", + "node_modules/@stylistic/eslint-plugin": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.4.0.tgz", + "integrity": "sha512-bIh/d9X+OQLCAMdhHtps+frvyjvAM4B1YlSJzcEEhl7wXLIqPar3ngn9DrHhkBOrTA/z9J0bUMtctAspe0dxdQ==", "dev": true, + "license": "MIT", "dependencies": { + "@typescript-eslint/utils": "^8.32.1", "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0" + "espree": "^10.3.0", + "estraverse": "^5.3.0", + "picomatch": "^4.0.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -297,11 +324,12 @@ "eslint": ">=9.0.0" } }, - "node_modules/@stylistic/eslint-plugin-js/node_modules/eslint-visitor-keys": { + "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -337,18 +365,144 @@ "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", "license": "MIT" }, - "node_modules/accepts": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", - "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", + "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==", "dev": true, "license": "MIT", "dependencies": { - "mime-types": "^3.0.0", - "negotiator": "^1.0.0" + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1" }, "engines": { - "node": ">= 0.6" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz", + "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz", + "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <5.9.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz", + "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.32.1", + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/typescript-estree": "8.32.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz", + "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.32.1", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/acorn": { @@ -451,27 +605,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, - "node_modules/body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.0", - "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", - "on-finished": "^2.4.1", - "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -481,6 +614,19 @@ "concat-map": "0.0.1" } }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/browserslist": { "version": "4.24.5", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz", @@ -513,47 +659,6 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -633,63 +738,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, - "node_modules/content-disposition": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", - "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", - "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.6.0" - } - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dev": true, - "license": "MIT", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", @@ -752,16 +800,6 @@ "node": ">=0.10.0" } }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -789,44 +827,12 @@ "url": "https://dotenvx.com" } }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, - "license": "MIT" - }, "node_modules/electron-to-chromium": { "version": "1.5.150", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz", "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==", "license": "ISC" }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/enquirer": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", @@ -839,39 +845,6 @@ "node": ">=8.6" } }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -881,13 +854,6 @@ "node": ">=6" } }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, - "license": "MIT" - }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -901,9 +867,9 @@ } }, "node_modules/eslint": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", - "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", + "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", "dev": true, "license": "MIT", "dependencies": { @@ -911,14 +877,13 @@ "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.26.0", - "@eslint/plugin-kit": "^0.2.8", + "@eslint/js": "9.27.0", + "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", - "@modelcontextprotocol/sdk": "^1.8.0", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -942,8 +907,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "zod": "^3.24.2" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -1106,98 +1070,6 @@ "node": ">=0.10.0" } }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/eventsource": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", - "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventsource-parser": "^3.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/eventsource-parser": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.2.tgz", - "integrity": "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/express": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", - "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "^2.0.0", - "body-parser": "^2.2.0", - "content-disposition": "^1.0.0", - "content-type": "^1.0.5", - "cookie": "^0.7.1", - "cookie-signature": "^1.2.1", - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "finalhandler": "^2.1.0", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "merge-descriptors": "^2.0.0", - "mime-types": "^3.0.0", - "on-finished": "^2.4.1", - "once": "^1.4.0", - "parseurl": "^1.3.3", - "proxy-addr": "^2.0.7", - "qs": "^6.14.0", - "range-parser": "^1.2.1", - "router": "^2.2.0", - "send": "^1.1.0", - "serve-static": "^2.2.0", - "statuses": "^2.0.1", - "type-is": "^2.0.1", - "vary": "^1.1.2" - }, - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1205,6 +1077,36 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -1218,6 +1120,16 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -1231,22 +1143,17 @@ "node": ">=16.0.0" } }, - "node_modules/finalhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", - "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "license": "MIT", "dependencies": { - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "on-finished": "^2.4.1", - "parseurl": "^1.3.3", - "statuses": "^2.0.1" + "to-regex-range": "^5.0.1" }, "engines": { - "node": ">= 0.8" + "node": ">=8" } }, "node_modules/find-up": { @@ -1346,26 +1253,6 @@ "node": ">=0.10.0" } }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", - "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -1386,16 +1273,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "license": "ISC" }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/generative-bayesian-network": { "version": "2.1.66", "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.66.tgz", @@ -1406,45 +1283,6 @@ "tslib": "^2.4.0" } }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -1491,19 +1329,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -1519,32 +1344,6 @@ "node": ">=8" } }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/header-generator": { "version": "2.1.66", "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.66.tgz", @@ -1560,36 +1359,6 @@ "node": ">=16.0.0" } }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -1643,16 +1412,6 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, "node_modules/is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -1689,6 +1448,16 @@ "node": ">=0.10.0" } }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -1710,13 +1479,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-promise": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", - "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", - "dev": true, - "license": "MIT" - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -1863,26 +1625,6 @@ "url": "https://github.com/sponsors/typicode" } }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/media-typer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", - "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/merge-deep": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", @@ -1897,40 +1639,41 @@ "node": ">=0.10.0" } }, - "node_modules/merge-descriptors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", - "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 8" } }, - "node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "license": "MIT", "dependencies": { - "mime-db": "^1.54.0" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { - "node": ">= 0.6" + "node": ">=8.6" + } + }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/minimatch": { @@ -1978,58 +1721,12 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/node-releases": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "license": "MIT" }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -2128,16 +1825,6 @@ "node": ">=6" } }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -2164,30 +1851,23 @@ "node": ">=8" } }, - "node_modules/path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - } - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, - "node_modules/pkce-challenge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", - "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", "engines": { - "node": ">=16.20.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/playwright-core": { @@ -2227,20 +1907,6 @@ "node": ">= 0.8.0" } }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -2357,47 +2023,26 @@ } } }, - "node_modules/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.1.0" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", - "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.6.3", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" }, "node_modules/resolve-from": { "version": "4.0.0", @@ -2409,6 +2054,17 @@ "node": ">=4" } }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -2425,27 +2081,10 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.4.0", - "depd": "^2.0.0", - "is-promise": "^4.0.0", - "parseurl": "^1.3.3", - "path-to-regexp": "^8.0.0" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -2461,61 +2100,24 @@ "url": "https://feross.org/support" } ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/send": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", - "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", - "dev": true, "license": "MIT", "dependencies": { - "debug": "^4.3.5", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "mime-types": "^3.0.1", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.1" - }, - "engines": { - "node": ">= 18" + "queue-microtask": "^1.2.2" } }, - "node_modules/serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, - "license": "MIT", - "dependencies": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, "engines": { - "node": ">= 18" + "node": ">=10" } }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" - }, "node_modules/shallow-clone": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", @@ -2571,92 +2173,6 @@ "node": ">=8" } }, - "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/steno": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz", @@ -2713,14 +2229,30 @@ "node": ">=0.2.6" } }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-api-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "license": "MIT", "engines": { - "node": ">=0.6" + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" } }, "node_modules/tslib": { @@ -2741,19 +2273,19 @@ "node": ">= 0.8.0" } }, - "node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "node_modules/typescript": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, - "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, "engines": { - "node": ">= 0.6" + "node": ">=14.17" } }, "node_modules/universalify": { @@ -2765,16 +2297,6 @@ "node": ">= 10.0.0" } }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -2824,16 +2346,6 @@ "node": ">=0.10.0" } }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -2865,26 +2377,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/zod": { - "version": "3.24.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", - "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, - "node_modules/zod-to-json-schema": { - "version": "3.24.5", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", - "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", - "dev": true, - "license": "ISC", - "peerDependencies": { - "zod": "^3.24.1" - } } }, "dependencies": { @@ -2895,12 +2387,12 @@ "dev": true }, "@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", "dev": true, "requires": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" } }, "@eslint-community/regexpp": { @@ -2927,9 +2419,9 @@ "dev": true }, "@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", + "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", "dev": true, "requires": { "@types/json-schema": "^7.0.15" @@ -2953,9 +2445,9 @@ } }, "@eslint/js": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", - "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", + "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", "dev": true }, "@eslint/object-schema": { @@ -2965,12 +2457,12 @@ "dev": true }, "@eslint/plugin-kit": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", - "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", + "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", "dev": true, "requires": { - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "levn": "^0.4.1" } }, @@ -3002,22 +2494,30 @@ "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", "dev": true }, - "@modelcontextprotocol/sdk": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.3.tgz", - "integrity": "sha512-rmOWVRUbUJD7iSvJugjUbFZshTAuJ48MXoZ80Osx1GM0K/H1w7rSEvmw8m6vdWxNASgtaHIhAgre4H/E9GJiYQ==", + "@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.5", - "eventsource": "^3.0.2", - "express": "^5.0.1", - "express-rate-limit": "^7.5.0", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.23.8", - "zod-to-json-schema": "^3.24.1" + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" } }, "@otplib/core": { @@ -3067,14 +2567,17 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" }, - "@stylistic/eslint-plugin-js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz", - "integrity": "sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==", + "@stylistic/eslint-plugin": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.4.0.tgz", + "integrity": "sha512-bIh/d9X+OQLCAMdhHtps+frvyjvAM4B1YlSJzcEEhl7wXLIqPar3ngn9DrHhkBOrTA/z9J0bUMtctAspe0dxdQ==", "dev": true, "requires": { + "@typescript-eslint/utils": "^8.32.1", "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0" + "espree": "^10.3.0", + "estraverse": "^5.3.0", + "picomatch": "^4.0.2" }, "dependencies": { "eslint-visitor-keys": { @@ -3110,14 +2613,86 @@ "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==" }, - "accepts": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", - "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "@typescript-eslint/scope-manager": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", + "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==", "dev": true, "requires": { - "mime-types": "^3.0.0", - "negotiator": "^1.0.0" + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1" + } + }, + "@typescript-eslint/types": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz", + "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz", + "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==", + "dev": true, + "requires": { + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.1.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, + "@typescript-eslint/utils": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz", + "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==", + "dev": true, + "requires": { + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.32.1", + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/typescript-estree": "8.32.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz", + "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "8.32.1", + "eslint-visitor-keys": "^4.2.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true + } } }, "acorn": { @@ -3185,23 +2760,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, - "body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", - "dev": true, - "requires": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.0", - "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", - "on-finished": "^2.4.1", - "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3211,6 +2769,15 @@ "concat-map": "0.0.1" } }, + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "requires": { + "fill-range": "^7.1.1" + } + }, "browserslist": { "version": "4.24.5", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz", @@ -3222,32 +2789,6 @@ "update-browserslist-db": "^1.1.3" } }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - }, - "call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - } - }, - "call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - } - }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -3295,43 +2836,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, - "content-disposition": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", - "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true - }, - "cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true - }, - "cookie-signature": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", - "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", - "dev": true - }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dev": true, - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, "cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", @@ -3369,12 +2873,6 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, "dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -3388,34 +2886,11 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" }, - "dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true - }, "electron-to-chromium": { "version": "1.5.150", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz", "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==" }, - "encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true - }, "enquirer": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", @@ -3425,38 +2900,11 @@ "strip-ansi": "^6.0.1" } }, - "es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true - }, - "es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true - }, - "es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "requires": { - "es-errors": "^1.3.0" - } - }, "escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==" }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -3464,23 +2912,22 @@ "dev": true }, "eslint": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", - "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", + "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.26.0", - "@eslint/plugin-kit": "^0.2.8", + "@eslint/js": "9.27.0", + "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", - "@modelcontextprotocol/sdk": "^1.8.0", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -3504,8 +2951,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "zod": "^3.24.2" + "optionator": "^0.9.3" }, "dependencies": { "@humanwhocodes/retry": { @@ -3597,75 +3043,36 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "eventsource": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", - "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", - "dev": true, - "requires": { - "eventsource-parser": "^3.0.1" - } - }, - "eventsource-parser": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.2.tgz", - "integrity": "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA==", - "dev": true - }, - "express": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", - "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", - "dev": true, - "requires": { - "accepts": "^2.0.0", - "body-parser": "^2.2.0", - "content-disposition": "^1.0.0", - "content-type": "^1.0.5", - "cookie": "^0.7.1", - "cookie-signature": "^1.2.1", - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "finalhandler": "^2.1.0", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "merge-descriptors": "^2.0.0", - "mime-types": "^3.0.0", - "on-finished": "^2.4.1", - "once": "^1.4.0", - "parseurl": "^1.3.3", - "proxy-addr": "^2.0.7", - "qs": "^6.14.0", - "range-parser": "^1.2.1", - "router": "^2.2.0", - "send": "^1.1.0", - "serve-static": "^2.2.0", - "statuses": "^2.0.1", - "type-is": "^2.0.1", - "vary": "^1.1.2" - } - }, - "express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", - "dev": true, - "requires": {} - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } + }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -3678,6 +3085,15 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, "file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -3687,18 +3103,13 @@ "flat-cache": "^4.0.0" } }, - "finalhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", - "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "on-finished": "^2.4.1", - "parseurl": "^1.3.3", - "statuses": "^2.0.1" + "to-regex-range": "^5.0.1" } }, "find-up": { @@ -3759,18 +3170,6 @@ "for-in": "^1.0.1" } }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true - }, - "fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", - "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "dev": true - }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -3786,12 +3185,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true - }, "generative-bayesian-network": { "version": "2.1.66", "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.66.tgz", @@ -3801,34 +3194,6 @@ "tslib": "^2.4.0" } }, - "get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - } - }, - "get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "requires": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -3857,12 +3222,6 @@ "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true }, - "gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true - }, "graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -3874,21 +3233,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "requires": { - "function-bind": "^1.1.2" - } - }, "header-generator": { "version": "2.1.66", "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.66.tgz", @@ -3900,28 +3244,6 @@ "tslib": "^2.4.0" } }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, "ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3958,12 +3280,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -3989,6 +3305,12 @@ "is-extglob": "^2.1.1" } }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -4002,12 +3324,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", - "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", - "dev": true - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -4114,18 +3430,6 @@ "steno": "^4.0.2" } }, - "math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true - }, - "media-typer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", - "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "dev": true - }, "merge-deep": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", @@ -4136,25 +3440,28 @@ "kind-of": "^3.0.2" } }, - "merge-descriptors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", - "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, - "mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true - }, - "mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "mime-db": "^1.54.0" + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "dependencies": { + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + } } }, "minimatch": { @@ -4192,38 +3499,11 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "dev": true - }, "node-releases": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==" }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true - }, - "object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -4295,12 +3575,6 @@ "callsites": "^3.0.0" } }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4317,21 +3591,15 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, - "path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true - }, "picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, - "pkce-challenge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", - "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", + "picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true }, "playwright-core": { @@ -4353,16 +3621,6 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4411,39 +3669,24 @@ "puppeteer-extra-plugin-user-data-dir": "^2.4.1" } }, - "qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "dev": true, - "requires": { - "side-channel": "^1.1.0" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, - "raw-body": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", - "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.6.3", - "unpipe": "1.0.0" - } - }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, + "reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true + }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -4452,66 +3695,19 @@ "glob": "^7.1.3" } }, - "router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", - "dev": true, - "requires": { - "debug": "^4.4.0", - "depd": "^2.0.0", - "is-promise": "^4.0.0", - "parseurl": "^1.3.3", - "path-to-regexp": "^8.0.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "send": { + "run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", - "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "requires": { - "debug": "^4.3.5", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "mime-types": "^3.0.1", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.1" + "queue-microtask": "^1.2.2" } }, - "serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", - "dev": true, - "requires": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true }, "shallow-clone": { @@ -4553,60 +3749,6 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, - "side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - } - }, - "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - } - }, - "side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - } - }, - "side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true - }, "steno": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz", @@ -4640,11 +3782,21 @@ "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==" }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "ts-api-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", + "dev": true, + "requires": {} }, "tslib": { "version": "2.8.1", @@ -4660,28 +3812,18 @@ "prelude-ls": "^1.2.1" } }, - "type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "typescript": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, - "requires": { - "content-type": "^1.0.5", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" - } + "peer": true }, "universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true - }, "update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -4705,12 +3847,6 @@ "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", "integrity": "sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==" }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -4729,19 +3865,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true - }, - "zod": { - "version": "3.24.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", - "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", - "dev": true - }, - "zod-to-json-schema": { - "version": "3.24.5", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", - "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", - "dev": true, - "requires": {} } } } diff --git a/package.json b/package.json index 0487277..da7eca4 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { - "@stylistic/eslint-plugin-js": "^4.2.0", - "eslint": "^9.26.0" + "@stylistic/eslint-plugin": "^4.4.0", + "eslint": "^9.27.0" } } From 8ba46c52ecceae40ea9d6841d2a98e4dd931e9d3 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 23:11:19 +0200 Subject: [PATCH 034/167] eslint with sarif upload example from https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool --- .github/workflows/eslint.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/eslint.yml diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml new file mode 100644 index 0000000..03816fc --- /dev/null +++ b/.github/workflows/eslint.yml @@ -0,0 +1,33 @@ +# https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool + +name: "ESLint analysis" + +# Run workflow each time code is pushed to your repository and on a schedule. +# The scheduled workflow runs every Wednesday at 15:45 UTC. +on: + push: + schedule: + - cron: '45 15 * * 3' + +jobs: + build: + runs-on: ubuntu-latest + permissions: + # required for all workflows + security-events: write + # only required for workflows in private repositories + actions: read + contents: read + steps: + - uses: actions/checkout@v4 + - name: Run npm install + run: npm install + # Runs the ESlint code analysis + - name: Run ESLint + # eslint exits 1 if it finds anything to report + run: node_modules/.bin/eslint build docs lib script spec-main -f node_modules/@microsoft/eslint-formatter-sarif/sarif.js -o results.sarif || true + # Uploads results.sarif to GitHub repository using the upload-sarif action + - uses: github/codeql-action/upload-sarif@v3 + with: + # Path to SARIF file relative to the root of the repository + sarif_file: results.sarif From 603224c13ea5b7f9e08e555cde7ecfafdec5ef62 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 23:12:02 +0200 Subject: [PATCH 035/167] eslint.yml -> js.yml --- .github/workflows/{eslint.yml => js.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{eslint.yml => js.yml} (100%) diff --git a/.github/workflows/eslint.yml b/.github/workflows/js.yml similarity index 100% rename from .github/workflows/eslint.yml rename to .github/workflows/js.yml From c0abc6ee4514b20fed80db7217af936a9ca4dc6d Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 23:23:37 +0200 Subject: [PATCH 036/167] run eslint with sarif and then normally? --- .github/workflows/js.yml | 32 +-- package-lock.json | 526 +++++++++++++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 540 insertions(+), 19 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 03816fc..3807282 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -1,33 +1,27 @@ -# https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool +name: "JS CI: npm, deps, eslint, tests" -name: "ESLint analysis" - -# Run workflow each time code is pushed to your repository and on a schedule. -# The scheduled workflow runs every Wednesday at 15:45 UTC. on: push: - schedule: - - cron: '45 15 * * 3' jobs: build: runs-on: ubuntu-latest permissions: - # required for all workflows - security-events: write - # only required for workflows in private repositories - actions: read - contents: read + security-events: write # required for sarif upload steps: - uses: actions/checkout@v4 - - name: Run npm install + - name: npm install run: npm install - # Runs the ESlint code analysis - - name: Run ESLint + + # https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool + - name: eslint (sarif output) # eslint exits 1 if it finds anything to report - run: node_modules/.bin/eslint build docs lib script spec-main -f node_modules/@microsoft/eslint-formatter-sarif/sarif.js -o results.sarif || true - # Uploads results.sarif to GitHub repository using the upload-sarif action - - uses: github/codeql-action/upload-sarif@v3 + run: npx eslint . --format node_modules/@microsoft/eslint-formatter-sarif/sarif.js -o results.sarif || true + - name: upload eslint sarif output for Security tab and inline results + uses: github/codeql-action/upload-sarif@v3 with: - # Path to SARIF file relative to the root of the repository sarif_file: results.sarif + + - name: npm run lint + # eslint exits 1 if it finds anything to report + run: npm run lint diff --git a/package-lock.json b/package-lock.json index 438578e..93d3422 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { + "@microsoft/eslint-formatter-sarif": "^3.1.0", "@stylistic/eslint-plugin": "^4.4.0", "eslint": "^9.27.0" }, @@ -185,6 +186,22 @@ "node": ">=18.18.0" } }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -198,6 +215,14 @@ "url": "https://github.com/sponsors/nzakas" } }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/@humanwhocodes/retry": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", @@ -212,6 +237,209 @@ "url": "https://github.com/sponsors/nzakas" } }, + "node_modules/@microsoft/eslint-formatter-sarif": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz", + "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint": "^8.9.0", + "jschardet": "latest", + "lodash": "^4.17.14", + "utf8": "^3.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@microsoft/eslint-formatter-sarif/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -505,6 +733,13 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, "node_modules/acorn": { "version": "8.14.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", @@ -800,6 +1035,19 @@ "node": ">=0.10.0" } }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -1335,6 +1583,13 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1467,6 +1722,16 @@ "node": ">=8" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -1506,6 +1771,16 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jschardet": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz", + "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==", + "dev": true, + "license": "LGPL-2.1+", + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -1597,6 +1872,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -2221,6 +2503,13 @@ "node": ">=8" } }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, "node_modules/thirty-two": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", @@ -2273,6 +2562,19 @@ "node": ">= 0.8.0" } }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/typescript": { "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", @@ -2337,6 +2639,13 @@ "punycode": "^2.1.0" } }, + "node_modules/utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", + "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", + "dev": true, + "license": "MIT" + }, "node_modules/vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", @@ -2482,18 +2791,178 @@ "@humanwhocodes/retry": "^0.3.0" } }, + "@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + } + }, "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true }, + "@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "dev": true + }, "@humanwhocodes/retry": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", "dev": true }, + "@microsoft/eslint-formatter-sarif": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz", + "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==", + "dev": true, + "requires": { + "eslint": "^8.9.0", + "jschardet": "latest", + "lodash": "^4.17.14", + "utf8": "^3.0.0" + }, + "dependencies": { + "@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + } + }, + "@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "dev": true, + "requires": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + } + }, + "eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "requires": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + } + }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, + "flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "requires": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + } + }, + "globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2695,6 +3164,12 @@ } } }, + "@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true + }, "acorn": { "version": "8.14.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", @@ -2873,6 +3348,15 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -3227,6 +3711,12 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3316,6 +3806,12 @@ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true + }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -3343,6 +3839,12 @@ "argparse": "^2.0.1" } }, + "jschardet": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz", + "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==", + "dev": true + }, "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -3411,6 +3913,12 @@ "p-locate": "^5.0.0" } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -3777,6 +4285,12 @@ "has-flag": "^4.0.0" } }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, "thirty-two": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", @@ -3812,6 +4326,12 @@ "prelude-ls": "^1.2.1" } }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + }, "typescript": { "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", @@ -3842,6 +4362,12 @@ "punycode": "^2.1.0" } }, + "utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", + "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", + "dev": true + }, "vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", diff --git a/package.json b/package.json index da7eca4..ac1d57c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { + "@microsoft/eslint-formatter-sarif": "^3.1.0", "@stylistic/eslint-plugin": "^4.4.0", "eslint": "^9.27.0" } From fee46d38e08679d716988958f51897205b11676a Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 23:40:48 +0200 Subject: [PATCH 037/167] ci/js: check size of dependencies https://stackoverflow.com/questions/40642008/how-do-i-view-the-size-of-npm-packages --- .github/workflows/js.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 3807282..c47ec72 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -13,6 +13,14 @@ jobs: - name: npm install run: npm install + # check size of dependencies + - name: dep-size howfat + run: npx --yes howfat -d --reporter table --sort size- + - name: dep-size qnm + run: npx --yes qnm doctor + - name: dep-size cost-of-modules + run: npx --yes npx cost-of-modules --include-dev --no-install + # https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool - name: eslint (sarif output) # eslint exits 1 if it finds anything to report From 305effe7f1638a8ac2f66c6334c0d600c63fbcb3 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sat, 24 May 2025 23:56:46 +0200 Subject: [PATCH 038/167] dep size in job summary? --- .github/workflows/js.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index c47ec72..52e59ad 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -1,4 +1,4 @@ -name: "JS CI: npm, deps, eslint, tests" +name: "JS: npm, deps, eslint, tests" on: push: @@ -14,8 +14,13 @@ jobs: run: npm install # check size of dependencies - - name: dep-size howfat - run: npx --yes howfat -d --reporter table --sort size- + # all tools gave different results locally + - name: dep-size node_modules + run: du -sh node_modules | tee -a "$GITHUB_STEP_SUMMARY" + - name: dep-size howfat -d (inc. dev) + run: npx --yes howfat -d --reporter table --sort size- | tee -a "$GITHUB_STEP_SUMMARY" + - name: dep-size howfat -d -p (inc. dev, peer) + run: npx --yes howfat -d -p --reporter table --sort size- | tee -a "$GITHUB_STEP_SUMMARY" - name: dep-size qnm run: npx --yes qnm doctor - name: dep-size cost-of-modules @@ -29,6 +34,7 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: results.sarif + category: eslint - name: npm run lint # eslint exits 1 if it finds anything to report From 2380d24e6094f6437ec37d633916ddb00b8f6eac Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 00:06:02 +0200 Subject: [PATCH 039/167] howfat tables don't work as md --- .github/workflows/js.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 52e59ad..4a23ccb 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -17,14 +17,16 @@ jobs: # all tools gave different results locally - name: dep-size node_modules run: du -sh node_modules | tee -a "$GITHUB_STEP_SUMMARY" - - name: dep-size howfat -d (inc. dev) - run: npx --yes howfat -d --reporter table --sort size- | tee -a "$GITHUB_STEP_SUMMARY" - - name: dep-size howfat -d -p (inc. dev, peer) - run: npx --yes howfat -d -p --reporter table --sort size- | tee -a "$GITHUB_STEP_SUMMARY" - - name: dep-size qnm - run: npx --yes qnm doctor - - name: dep-size cost-of-modules - run: npx --yes npx cost-of-modules --include-dev --no-install + - name: dep-size howfat -d (inc. dev) - ignores size of transitive deps + run: npx --yes howfat -d --reporter table --sort size- + - name: dep-size howfat -d -p (inc. dev, peer) - includes size of transitive deps per dep + run: npx --yes howfat -d -p --reporter table --sort size- + - name: dep-size qnm (flat list as in node_modules) + run: | + echo 'npx --yes qnm doctor' >> "$GITHUB_STEP_SUMMARY" + npx --yes qnm doctor | tee -a "$GITHUB_STEP_SUMMARY" + # - name: dep-size cost-of-modules # this says total 8.37MB while du says 75MB... + # run: npx --yes npx cost-of-modules --include-dev --no-install # https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool - name: eslint (sarif output) From ef94943ee82ca4c3823326b9a8dc43298a2db459 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 00:08:28 +0200 Subject: [PATCH 040/167] nicer md for job summary --- .github/workflows/js.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 4a23ccb..35c10cc 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -23,8 +23,10 @@ jobs: run: npx --yes howfat -d -p --reporter table --sort size- - name: dep-size qnm (flat list as in node_modules) run: | - echo 'npx --yes qnm doctor' >> "$GITHUB_STEP_SUMMARY" + echo '```console' >> "$GITHUB_STEP_SUMMARY" + echo '$ npx --yes qnm doctor' >> "$GITHUB_STEP_SUMMARY" npx --yes qnm doctor | tee -a "$GITHUB_STEP_SUMMARY" + echo '```' >> "$GITHUB_STEP_SUMMARY" # - name: dep-size cost-of-modules # this says total 8.37MB while du says 75MB... # run: npx --yes npx cost-of-modules --include-dev --no-install From 3d2df7654cd9cd8196a0d1b05ed02b5220288d38 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 00:12:54 +0200 Subject: [PATCH 041/167] switch ci from npm to bun https://bun.sh/guides/runtime/cicd --- .github/workflows/js.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 35c10cc..6cac954 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -10,17 +10,19 @@ jobs: security-events: write # required for sarif upload steps: - uses: actions/checkout@v4 - - name: npm install - run: npm install + + - uses: oven-sh/setup-bun@v2 + - name: bun install + run: bun install # check size of dependencies # all tools gave different results locally - name: dep-size node_modules run: du -sh node_modules | tee -a "$GITHUB_STEP_SUMMARY" - name: dep-size howfat -d (inc. dev) - ignores size of transitive deps - run: npx --yes howfat -d --reporter table --sort size- + run: bunx howfat -d --reporter table --sort size- - name: dep-size howfat -d -p (inc. dev, peer) - includes size of transitive deps per dep - run: npx --yes howfat -d -p --reporter table --sort size- + run: bunx howfat -d -p --reporter table --sort size- - name: dep-size qnm (flat list as in node_modules) run: | echo '```console' >> "$GITHUB_STEP_SUMMARY" @@ -40,6 +42,6 @@ jobs: sarif_file: results.sarif category: eslint - - name: npm run lint + - name: bun lint # eslint exits 1 if it finds anything to report - run: npm run lint + run: bun lint From a110b237d58af58779e63b10afa5fb6f6af345b9 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 00:14:49 +0200 Subject: [PATCH 042/167] bun install almost twice as fast --- .github/workflows/js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 6cac954..afc6cd4 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -1,4 +1,4 @@ -name: "JS: npm, deps, eslint, tests" +name: "JS: deps, lint, tests" on: push: From d05837b6b8495d938f5ca29b61528d6ff6f289d8 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 00:22:16 +0200 Subject: [PATCH 043/167] rm @microsoft/eslint-formatter-sarif (uses its own old eslint) and wget sarif.js --- .github/workflows/js.yml | 10 +- package-lock.json | 526 --------------------------------------- package.json | 1 - 3 files changed, 8 insertions(+), 529 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index afc6cd4..9ad15b5 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -34,8 +34,14 @@ jobs: # https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool - name: eslint (sarif output) - # eslint exits 1 if it finds anything to report - run: npx eslint . --format node_modules/@microsoft/eslint-formatter-sarif/sarif.js -o results.sarif || true + # https://github.com/microsoft/sarif-js-sdk/issues/91 + # @microsoft/eslint-formatter-sarif uses eslint@8.57.1 instead of my local eslint@9.27.0 despite it not needing it? -> just download the sarif.js file instead of having dep in package.json (only needed here anyway) + run: | + wget https://raw.githubusercontent.com/microsoft/sarif-js-sdk/refs/heads/main/packages/eslint-formatter-sarif/sarif.js -O node_modules/sarif.cjs + bun i utf8 lodash jschardet + bunx eslint . --format node_modules/sarif.cjs -o results.sarif + continue-on-error: true + - name: upload eslint sarif output for Security tab and inline results uses: github/codeql-action/upload-sarif@v3 with: diff --git a/package-lock.json b/package-lock.json index 93d3422..438578e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,6 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { - "@microsoft/eslint-formatter-sarif": "^3.1.0", "@stylistic/eslint-plugin": "^4.4.0", "eslint": "^9.27.0" }, @@ -186,22 +185,6 @@ "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -215,14 +198,6 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true, - "license": "BSD-3-Clause" - }, "node_modules/@humanwhocodes/retry": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", @@ -237,209 +212,6 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@microsoft/eslint-formatter-sarif": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz", - "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint": "^8.9.0", - "jschardet": "latest", - "lodash": "^4.17.14", - "utf8": "^3.0.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@microsoft/eslint-formatter-sarif/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -733,13 +505,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC" - }, "node_modules/acorn": { "version": "8.14.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", @@ -1035,19 +800,6 @@ "node": ">=0.10.0" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -1583,13 +1335,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1722,16 +1467,6 @@ "node": ">=8" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -1771,16 +1506,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jschardet": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz", - "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==", - "dev": true, - "license": "LGPL-2.1+", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -1872,13 +1597,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -2503,13 +2221,6 @@ "node": ">=8" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, "node_modules/thirty-two": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", @@ -2562,19 +2273,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/typescript": { "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", @@ -2639,13 +2337,6 @@ "punycode": "^2.1.0" } }, - "node_modules/utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", - "dev": true, - "license": "MIT" - }, "node_modules/vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", @@ -2791,178 +2482,18 @@ "@humanwhocodes/retry": "^0.3.0" } }, - "@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - } - }, "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true }, - "@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true - }, "@humanwhocodes/retry": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", "dev": true }, - "@microsoft/eslint-formatter-sarif": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz", - "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==", - "dev": true, - "requires": { - "eslint": "^8.9.0", - "jschardet": "latest", - "lodash": "^4.17.14", - "utf8": "^3.0.0" - }, - "dependencies": { - "@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - } - }, - "@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - } - }, - "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "requires": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "requires": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - } - }, - "globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - } - } - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -3164,12 +2695,6 @@ } } }, - "@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true - }, "acorn": { "version": "8.14.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", @@ -3348,15 +2873,6 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, "dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -3711,12 +3227,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3806,12 +3316,6 @@ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -3839,12 +3343,6 @@ "argparse": "^2.0.1" } }, - "jschardet": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz", - "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==", - "dev": true - }, "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -3913,12 +3411,6 @@ "p-locate": "^5.0.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -4285,12 +3777,6 @@ "has-flag": "^4.0.0" } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "thirty-two": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", @@ -4326,12 +3812,6 @@ "prelude-ls": "^1.2.1" } }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - }, "typescript": { "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", @@ -4362,12 +3842,6 @@ "punycode": "^2.1.0" } }, - "utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", - "dev": true - }, "vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", diff --git a/package.json b/package.json index ac1d57c..da7eca4 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "puppeteer-extra-plugin-stealth": "^2.11.2" }, "devDependencies": { - "@microsoft/eslint-formatter-sarif": "^3.1.0", "@stylistic/eslint-plugin": "^4.4.0", "eslint": "^9.27.0" } From d2e8f000b5f2c34f772cf9ff8f1ee42adace8b01 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 01:10:16 +0200 Subject: [PATCH 044/167] rm cross-env for `npm run docker` since it wasn't working right - readme as single source of truth for `docker run` cmd --- package-lock.json | 46 ++++++++++++++++------------------------------ package.json | 3 +-- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 438578e..e845837 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "AGPL-3.0-only", "dependencies": { "chalk": "^5.4.1", - "cross-env": "^7.0.3", "dotenv": "^16.5.0", "enquirer": "^2.4.1", "fingerprint-injector": "^2.1.66", @@ -738,27 +737,11 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, - "node_modules/cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=10.14", - "npm": ">=6", - "yarn": ">=1" - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1482,7 +1465,8 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "node_modules/isobject": { "version": "3.0.1", @@ -1847,6 +1831,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -2158,6 +2143,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -2169,6 +2155,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "engines": { "node": ">=8" } @@ -2350,6 +2337,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -2836,18 +2824,11 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, - "cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "requires": { - "cross-spawn": "^7.0.1" - } - }, "cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3327,7 +3308,8 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "isobject": { "version": "3.0.1", @@ -3589,7 +3571,8 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "picocolors": { "version": "1.1.1", @@ -3740,6 +3723,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -3747,7 +3731,8 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true }, "steno": { "version": "4.0.2", @@ -3851,6 +3836,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "requires": { "isexe": "^2.0.0" } diff --git a/package.json b/package.json index da7eca4..7c6cc83 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "main": "index.js", "scripts": { "docker:build": "docker build . -t ghcr.io/vogler/free-games-claimer", - "docker": "cross-env-shell docker run --rm -it -p 5900:5900 -p 6080:6080 -v \\\"$INIT_CWD/data\\\":/fgc/data --name fgc ghcr.io/vogler/free-games-claimer", + "docker": "docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer", "lint": "npx eslint ." }, "type": "module", @@ -21,7 +21,6 @@ }, "dependencies": { "chalk": "^5.4.1", - "cross-env": "^7.0.3", "dotenv": "^16.5.0", "enquirer": "^2.4.1", "fingerprint-injector": "^2.1.66", From d508675d0be6bfd27935fbe217ab917e3c1c933d Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 01:41:07 +0200 Subject: [PATCH 045/167] log (un)compressed docker image size = shared + unique --- .github/workflows/docker.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ae78582..ccf22b3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,6 +23,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Set environment variables run: | echo "NOW=$(date -R)" >> "$GITHUB_ENV" # date -Iseconds; date +'%Y-%m-%dT%H:%M:%S' @@ -49,6 +50,7 @@ jobs: # otherwise labels are not shown on GitHub due to multi-arch image: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images # https://github.com/docker/metadata-action#annotations DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index + - name: Login to Docker Hub uses: docker/login-action@v3 # if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} # does not work: Unrecognized named-value: 'secrets' - https://www.cloudtruth.com/blog/skipping-jobs-in-github-actions-when-secrets-are-unavailable-securely-inject-configuration-secrets-into-github @@ -62,10 +64,12 @@ jobs: registry: ghcr.io username: ${{ github.actor }} # actor is user that opened PR, was repository_owner before password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Build and push uses: docker/build-push-action@v6 if: ${{ env.IMAGE_TAG != '' }} @@ -87,3 +91,19 @@ jobs: # ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} cache-from: type=gha cache-to: type=gha,mode=max + + # https://gist.github.com/MichaelSimons/fb588539dcefd9b5fdf45ba04c302db6 + - name: Docker (un)compressed sizes + run: | + echo '```console' >> "$GITHUB_STEP_SUMMARY" + echo '# Uncompressed size (max, not size on disk due to sharing):' + echo '$ docker image ls' >> "$GITHUB_STEP_SUMMARY" + docker image ls | tee -a "$GITHUB_STEP_SUMMARY" + echo + echo '# size = unique + shared:' + echo '$ docker system df -v' >> "$GITHUB_STEP_SUMMARY" + docker system df -v | tee -a "$GITHUB_STEP_SUMMARY" + echo + dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } + dockersize ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} + echo '```' >> "$GITHUB_STEP_SUMMARY" From 6f3dbdbe142c72eaedfd2a694eae039be65c2852 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 02:00:41 +0200 Subject: [PATCH 046/167] need other commands to get sizes for docker buildx? --- .github/workflows/docker.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ccf22b3..a96c7b4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -96,14 +96,18 @@ jobs: - name: Docker (un)compressed sizes run: | echo '```console' >> "$GITHUB_STEP_SUMMARY" - echo '# Uncompressed size (max, not size on disk due to sharing):' - echo '$ docker image ls' >> "$GITHUB_STEP_SUMMARY" - docker image ls | tee -a "$GITHUB_STEP_SUMMARY" - echo - echo '# size = unique + shared:' - echo '$ docker system df -v' >> "$GITHUB_STEP_SUMMARY" - docker system df -v | tee -a "$GITHUB_STEP_SUMMARY" - echo + # echo '# Uncompressed size (max, not size on disk due to sharing):' + # echo '$ docker image ls' >> "$GITHUB_STEP_SUMMARY" + # docker image ls | tee -a "$GITHUB_STEP_SUMMARY" + # echo + # echo '# size = unique + shared:' + # echo '$ docker system df -v' >> "$GITHUB_STEP_SUMMARY" + # docker system df -v | tee -a "$GITHUB_STEP_SUMMARY" + ## the above work locally, but in CI with buildx just list moby/buildkit and tonistiigi/binfmt + echo "# Compressed sizes:" >> "$GITHUB_STEP_SUMMARY" dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } - dockersize ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} + dockersize ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} | tee -a "$GITHUB_STEP_SUMMARY" + log() { echo "\$ $@" >> "$GITHUB_STEP_SUMMARY"; "$@" >> "$GITHUB_STEP_SUMMARY"; } + log docker buildx history inspect + log docker buildx du echo '```' >> "$GITHUB_STEP_SUMMARY" From 3065ad1c5eedb833ac515f6c63474b72153a05f9 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 11:09:10 +0200 Subject: [PATCH 047/167] .dockerignore = strict superset of .gitignore, not DRY, but ok... --- .dockerignore | 6 ++++++ .gitignore | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 7fd39f7..59ea291 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,12 @@ node_modules/ data/ *.env +megalinter-reports/ + +# the above is just copied from .gitignore - violating DRY... +# however, generally, we want .dockerignore to be a *strict* superset of .gitignore, so we can't just `ln -s .gitignore .dockerignore` +# could generate this in CI and append the extra entries from below, but then it wouldn't work for local builds without running some script... +# also, the rules are slightly different: https://zzz.buzz/2018/05/23/differences-of-rules-between-gitignore-and-dockerignore/ .gitignore .github/ diff --git a/.gitignore b/.gitignore index e950054..a43f9f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ node_modules/ data/ *.env - megalinter-reports/ From 07a2c81f0582febfbaa7be42001ff8b531284268 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 11:23:32 +0200 Subject: [PATCH 048/167] uncompressed docker size with buildx --- .github/workflows/docker.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a96c7b4..341a4b0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -95,19 +95,19 @@ jobs: # https://gist.github.com/MichaelSimons/fb588539dcefd9b5fdf45ba04c302db6 - name: Docker (un)compressed sizes run: | - echo '```console' >> "$GITHUB_STEP_SUMMARY" - # echo '# Uncompressed size (max, not size on disk due to sharing):' - # echo '$ docker image ls' >> "$GITHUB_STEP_SUMMARY" - # docker image ls | tee -a "$GITHUB_STEP_SUMMARY" - # echo - # echo '# size = unique + shared:' - # echo '$ docker system df -v' >> "$GITHUB_STEP_SUMMARY" - # docker system df -v | tee -a "$GITHUB_STEP_SUMMARY" - ## the above work locally, but in CI with buildx just list moby/buildkit and tonistiigi/binfmt - echo "# Compressed sizes:" >> "$GITHUB_STEP_SUMMARY" + IMG=ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} + emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + emd '```console' + emd "# Compressed (download) sizes:" dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } - dockersize ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} | tee -a "$GITHUB_STEP_SUMMARY" - log() { echo "\$ $@" >> "$GITHUB_STEP_SUMMARY"; "$@" >> "$GITHUB_STEP_SUMMARY"; } - log docker buildx history inspect - log docker buildx du - echo '```' >> "$GITHUB_STEP_SUMMARY" + cmd dockersize "$IMG" + cmd docker buildx history inspect + cmd docker buildx du + ## in CI with buildx `docker image ls` just lists moby/buildkit and tonistiigi/binfmt since the multi-arch build is pushed to registry instead of loaded locally, so we need to pull it first (cached anyway) + cmd docker pull "$IMG" + emd '# Uncompressed size (max, not size on disk due to sharing):' + cmd docker image ls + emd '# size = unique + shared:' + cmd docker system df -v + emd '```' From b8fbc0a95d7684e6009816e0b2f81438529aba60 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 11:35:44 +0200 Subject: [PATCH 049/167] docker image rm buildkit stuff? --- .github/workflows/docker.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 341a4b0..bc7b76d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -102,12 +102,15 @@ jobs: emd "# Compressed (download) sizes:" dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } cmd dockersize "$IMG" - cmd docker buildx history inspect - cmd docker buildx du - ## in CI with buildx `docker image ls` just lists moby/buildkit and tonistiigi/binfmt since the multi-arch build is pushed to registry instead of loaded locally, so we need to pull it first (cached anyway) - cmd docker pull "$IMG" + ## don't need the following in job summary, but nice to have in full log + docker buildx history inspect + docker buildx du + ## not needed locally, but in CI with buildx `docker image ls` just lists moby/buildkit and tonistiigi/binfmt since the multi-arch build is pushed to registry instead of loaded locally, so we need to pull it first (cached anyway) + docker pull "$IMG" + docker image rm moby/buildkit + docker image rm tonistiigi/binfmt emd '# Uncompressed size (max, not size on disk due to sharing):' - cmd docker image ls + cmd docker image ls --tree emd '# size = unique + shared:' cmd docker system df -v emd '```' From 590a78f7df55dab7e5cfccd347dd1ce976b38f92 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 11:41:27 +0200 Subject: [PATCH 050/167] can't remove buildkit images? --- .github/workflows/docker.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bc7b76d..1db745a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -96,6 +96,7 @@ jobs: - name: Docker (un)compressed sizes run: | IMG=ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} + log() { echo "\$ $@"; "$@"; } emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' @@ -103,12 +104,12 @@ jobs: dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } cmd dockersize "$IMG" ## don't need the following in job summary, but nice to have in full log - docker buildx history inspect - docker buildx du + log docker buildx history inspect + # log docker buildx du ## not needed locally, but in CI with buildx `docker image ls` just lists moby/buildkit and tonistiigi/binfmt since the multi-arch build is pushed to registry instead of loaded locally, so we need to pull it first (cached anyway) - docker pull "$IMG" - docker image rm moby/buildkit - docker image rm tonistiigi/binfmt + log docker pull "$IMG" + # log docker image rm moby/buildkit # failed + # log docker image rm tonistiigi/binfmt emd '# Uncompressed size (max, not size on disk due to sharing):' cmd docker image ls --tree emd '# size = unique + shared:' From 713600d4e0eedb45f160591b12c1625ffb7abddf Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 11:59:04 +0200 Subject: [PATCH 051/167] grep size for image from df output --- .github/workflows/docker.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1db745a..d207ea6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -95,14 +95,14 @@ jobs: # https://gist.github.com/MichaelSimons/fb588539dcefd9b5fdf45ba04c302db6 - name: Docker (un)compressed sizes run: | - IMG=ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} - log() { echo "\$ $@"; "$@"; } + REP=ghcr.io/${{ github.actor }}/free-games-claimer + IMG=$REP:${{env.IMAGE_TAG}} + log() { echo "\n\$ $@"; "$@"; } emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' - emd "# Compressed (download) sizes:" - dockersize() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } - cmd dockersize "$IMG" + download-size() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } + cmd download-size "$IMG" ## don't need the following in job summary, but nice to have in full log log docker buildx history inspect # log docker buildx du @@ -110,8 +110,9 @@ jobs: log docker pull "$IMG" # log docker image rm moby/buildkit # failed # log docker image rm tonistiigi/binfmt - emd '# Uncompressed size (max, not size on disk due to sharing):' - cmd docker image ls --tree - emd '# size = unique + shared:' - cmd docker system df -v + # emd '# Uncompressed size (max, not size on disk due to sharing):' + # cmd docker image ls # below has more details + emd '# uncompressed size = unique + shared:' + local-size() { docker system df -v | grep "$1" -B1; } + cmd local-size "$REP" emd '```' From f06bcccce0193b85cd9d8f56cc97a30920a0271a Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 12:03:03 +0200 Subject: [PATCH 052/167] echo -e for \n --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d207ea6..cca8134 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -97,7 +97,7 @@ jobs: run: | REP=ghcr.io/${{ github.actor }}/free-games-claimer IMG=$REP:${{env.IMAGE_TAG}} - log() { echo "\n\$ $@"; "$@"; } + log() { echo -e "\n\$ $@"; "$@"; } emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' From 0158bd64a6743cbdf3efd2e7c170850463ce0900 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 15:05:04 +0200 Subject: [PATCH 053/167] use emd/cmd for js.yml --- .github/workflows/js.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 9ad15b5..2b4e383 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -25,10 +25,11 @@ jobs: run: bunx howfat -d -p --reporter table --sort size- - name: dep-size qnm (flat list as in node_modules) run: | - echo '```console' >> "$GITHUB_STEP_SUMMARY" - echo '$ npx --yes qnm doctor' >> "$GITHUB_STEP_SUMMARY" - npx --yes qnm doctor | tee -a "$GITHUB_STEP_SUMMARY" - echo '```' >> "$GITHUB_STEP_SUMMARY" + emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + emd '```console' + cmd npx --yes qnm doctor + emd '```' # - name: dep-size cost-of-modules # this says total 8.37MB while du says 75MB... # run: npx --yes npx cost-of-modules --include-dev --no-install From 4288bf1d39b1a567a3ae67f675e786a75a203efd Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 15:14:14 +0200 Subject: [PATCH 054/167] same triggers (push, PRs) for js, mega-linter, sonar --- .github/workflows/js.yml | 3 +++ .github/workflows/mega-linter.yml | 10 ++-------- .github/workflows/sonar.yml | 4 +--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 2b4e383..2f201ff 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -1,7 +1,10 @@ name: "JS: deps, lint, tests" +# Run on push in any branch and changes in PRs. on: push: +pull_request: + types: [opened, synchronize, reopened] jobs: build: diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 5f1c176..9ffe049 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -5,17 +5,11 @@ --- name: MegaLinter -# Trigger mega-linter at every push. Action will also be visible from -# Pull Requests to main +# Run on push in any branch and changes in PRs. on: - # Comment this line to trigger action only on pull-requests - # (not recommended if you don't pay for GH Actions) push: - pull_request: - branches: - - main - - dev + types: [opened, synchronize, reopened] # Comment env block if you do not want to apply fixes env: diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 41ae4de..66e0037 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -1,10 +1,8 @@ name: Sonar +# Run on push in any branch and changes in PRs. on: - # Trigger analysis when pushing in main or pull requests, and when creating a pull request. push: - branches: - - main pull_request: types: [opened, synchronize, reopened] From 25078694cd8d1253cf6a35d3baf35dc4c0d2df71 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 15:24:46 +0200 Subject: [PATCH 055/167] upgrade deprecated sonarcloud-github-action -> sonarqube-scan-action SonarScanner This action is deprecated and will be removed in a future release. Please use the sonarqube-scan-action action instead. The sonarqube-scan-action is a drop-in replacement for this action. --- .github/workflows/js.yml | 2 +- .../workflows/{sonar.yml => sonarqube.yml} | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename .github/workflows/{sonar.yml => sonarqube.yml} (57%) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 2f201ff..d2f28e7 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -43,7 +43,7 @@ jobs: run: | wget https://raw.githubusercontent.com/microsoft/sarif-js-sdk/refs/heads/main/packages/eslint-formatter-sarif/sarif.js -O node_modules/sarif.cjs bun i utf8 lodash jschardet - bunx eslint . --format node_modules/sarif.cjs -o results.sarif + bun eslint . --format node_modules/sarif.cjs -o results.sarif continue-on-error: true - name: upload eslint sarif output for Security tab and inline results diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonarqube.yml similarity index 57% rename from .github/workflows/sonar.yml rename to .github/workflows/sonarqube.yml index 66e0037..16ec7df 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonarqube.yml @@ -1,4 +1,4 @@ -name: Sonar +name: SonarQube Scan # Run on push in any branch and changes in PRs. on: @@ -10,25 +10,25 @@ permissions: contents: read jobs: - sonarcloud: + sonarqube: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting. Otherwise sonarcloud will show a warning. fetch-depth: 0 - - uses: actions/setup-node@v4 - with: - cache: "npm" - - name: Install dev dependencies which includde ESLint + plugins - run: npm install --only=dev - - name: Run ESLint + + - uses: oven-sh/setup-bun@v2 + - name: bun install + run: bun install + + - name: eslint (json output) continue-on-error: true - run: npx eslint . -f json -o eslint_report.json - - name: Fix ESLint paths + run: bun eslint . -f json -o eslint_report.json + - name: fix paths for SonarCloud run: sed -i 's+/home/runner/work/free-games-claimer/free-games-claimer+/github/workspace+g' eslint_report.json - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master + + - name: SonarQube Scan + uses: SonarSource/sonarqube-scan-action@5.2.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 33227081f6d63fe0a768196dff7725f865aa9c75 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 15:27:32 +0200 Subject: [PATCH 056/167] fix js.yml https://github.com/vogler/free-games-claimer/actions/runs/15238258120/job/42855019873 --- .github/workflows/js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index d2f28e7..36236db 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -3,8 +3,8 @@ name: "JS: deps, lint, tests" # Run on push in any branch and changes in PRs. on: push: -pull_request: - types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] jobs: build: From b4dcd0b8af5f5f98b4375a9fbb5e2959a835dde1 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:12:03 +0200 Subject: [PATCH 057/167] fix actionlint/shellcheck: $@ -> $* https://www.shellcheck.net/wiki/SC2145 --- .github/workflows/docker.yml | 6 +++--- .github/workflows/js.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cca8134..c9f3cae 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -97,9 +97,9 @@ jobs: run: | REP=ghcr.io/${{ github.actor }}/free-games-claimer IMG=$REP:${{env.IMAGE_TAG}} - log() { echo -e "\n\$ $@"; "$@"; } - emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } - cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + log() { echo -e "\n\$ $*"; "$*"; } + emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' download-size() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } cmd download-size "$IMG" diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 36236db..bb19118 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -28,8 +28,8 @@ jobs: run: bunx howfat -d -p --reporter table --sort size- - name: dep-size qnm (flat list as in node_modules) run: | - emd() { echo "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } - cmd() { echo "\$ $@" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } + emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' cmd npx --yes qnm doctor emd '```' From 3b321a28d64201d38bc20da95f3d006627d2bf41 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:16:17 +0200 Subject: [PATCH 058/167] js.yml forgot one npx -> bunx --- .github/workflows/js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index bb19118..118a7a2 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -31,7 +31,7 @@ jobs: emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' - cmd npx --yes qnm doctor + cmd bunx --yes qnm doctor emd '```' # - name: dep-size cost-of-modules # this says total 8.37MB while du says 75MB... # run: npx --yes npx cost-of-modules --include-dev --no-install From f7a584c41582f8c81a4a082e7bc4e05251483cd2 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:19:33 +0200 Subject: [PATCH 059/167] fix SonarQube Scan version https://github.com/marketplace/actions/official-sonarqube-scan --- .github/workflows/sonarqube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 16ec7df..c494468 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -29,6 +29,6 @@ jobs: run: sed -i 's+/home/runner/work/free-games-claimer/free-games-claimer+/github/workspace+g' eslint_report.json - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@5.2.0 + uses: SonarSource/sonarqube-scan-action@v5.2.0 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 9285b520172d78f1fac678b64579a9db69b513b6 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:31:12 +0200 Subject: [PATCH 060/167] respect INTERACTIVE=1 in gog and eg, not just pg --- epic-games.js | 3 ++- gog.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epic-games.js b/epic-games.js index 500e6cf..603bc33 100644 --- a/epic-games.js +++ b/epic-games.js @@ -3,7 +3,7 @@ import { authenticator } from 'otplib'; import chalk from 'chalk'; import path from 'path'; import { existsSync, writeFileSync, appendFileSync } from 'fs'; -import { resolve, jsonDb, datetime, stealth, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; +import { resolve, jsonDb, datetime, stealth, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'epic-games', ...a); @@ -260,6 +260,7 @@ try { if (cfg.time) console.timeEnd('claim game'); continue; } + if (cfg.interactive && !await confirm()) continue; // Playwright clicked before button was ready to handle event, https://github.com/vogler/free-games-claimer/issues/84#issuecomment-1474346591 await iframe.locator('button:has-text("Place Order"):not(:has(.payment-loading--loading))').click({ delay: 11 }); diff --git a/gog.js b/gog.js index 6269fc2..11fcfec 100644 --- a/gog.js +++ b/gog.js @@ -1,6 +1,6 @@ import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra import chalk from 'chalk'; -import { resolve, jsonDb, datetime, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; +import { resolve, jsonDb, datetime, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'gog', ...a); @@ -106,6 +106,7 @@ try { console.log(`Current free game: ${chalk.blue(title)} - ${url}`); db.data[user][title] ||= { title, time: datetime(), url }; if (cfg.dryrun) process.exit(1); + if (cfg.interactive && !await confirm()) process.exit(0); // await page.locator('#giveaway:not(.is-loading)').waitFor(); // otherwise screenshot is sometimes with loading indicator instead of game title; #TODO fix, skipped due to timeout, see #240 await banner.screenshot({ path: screenshot(`${filenamify(title)}.png`) }); // overwrites every time - only keep first? From 82d39d30b6d44fc26f486c23aa3d42bfbc0cad78 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:40:09 +0200 Subject: [PATCH 061/167] NOWAIT=1 to fail fast instead of waiting for user input hitting ctrl-c 3x to abort is annoying... --- epic-games.js | 1 + gog.js | 1 + prime-gaming.js | 1 + src/config.js | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epic-games.js b/epic-games.js index 603bc33..675a432 100644 --- a/epic-games.js +++ b/epic-games.js @@ -79,6 +79,7 @@ try { while (await page.locator('egs-navigation').getAttribute('isloggedin') != 'true') { console.error('Not signed in anymore. Please login in the browser or here in the terminal.'); + if (cfg.nowait) process.exit(1); if (cfg.novnc_port) console.info(`Open http://localhost:${cfg.novnc_port} to login inside the docker container.`); if (!cfg.debug) context.setDefaultTimeout(cfg.login_timeout); // give user some extra time to log in console.info(`Login timeout is ${cfg.login_timeout / 1000} seconds!`); diff --git a/gog.js b/gog.js index 11fcfec..d6c3ad4 100644 --- a/gog.js +++ b/gog.js @@ -47,6 +47,7 @@ try { await Promise.any([signIn.waitFor(), page.waitForSelector('#menuUsername')]); while (await signIn.isVisible()) { console.error('Not signed in anymore.'); + if (cfg.nowait) process.exit(1); await signIn.click(); // it then creates an iframe for the login await page.waitForSelector('#GalaxyAccountsFrameContainer iframe'); // TODO needed? diff --git a/prime-gaming.js b/prime-gaming.js index 4e1c7aa..23eb2bf 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -44,6 +44,7 @@ try { 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) { console.error('Not signed in anymore.'); + if (cfg.nowait) process.exit(1); await page.click('button:has-text("Sign in")'); if (!cfg.debug) context.setDefaultTimeout(cfg.login_timeout); // give user some extra time to log in console.info(`Login timeout is ${cfg.login_timeout / 1000} seconds!`); diff --git a/src/config.js b/src/config.js index a8b1817..a9522e9 100644 --- a/src/config.js +++ b/src/config.js @@ -9,8 +9,9 @@ export const cfg = { debug_network: process.env.DEBUG_NETWORK == '1', // log network requests and responses record: process.env.RECORD == '1', // `recordHar` (network) + `recordVideo` time: process.env.TIME == '1', // log duration of each step + interactive: process.env.INTERACTIVE == '1', // confirm to claim, enter to skip dryrun: process.env.DRYRUN == '1', // don't claim anything - interactive: process.env.INTERACTIVE == '1', // confirm to claim, default skip + nowait: process.env.NOWAIT == '1', // fail fast instead of waiting for user input show: process.env.SHOW == '1', // run non-headless get headless() { return !this.debug && !this.show; From 68d6122e8c94a00fa81b64709ce432adb30eba87 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 16:56:16 +0200 Subject: [PATCH 062/167] fix b4dcd0b: $@ needed to run command... https://github.com/vogler/free-games-claimer/actions/runs/15238732349/job/42856083012 --- .github/workflows/docker.yml | 5 +++-- .github/workflows/js.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c9f3cae..a4ece37 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -97,9 +97,9 @@ jobs: run: | REP=ghcr.io/${{ github.actor }}/free-games-claimer IMG=$REP:${{env.IMAGE_TAG}} - log() { echo -e "\n\$ $*"; "$*"; } + log() { echo -e "\n\$ $*"; "$@"; } emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } - cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' download-size() { docker manifest inspect -v "$1" | jq -c 'if type == "array" then .[] else . end' | jq -r '[ ( .Descriptor.platform | [ .os, .architecture, .variant, ."os.version" ] | del(..|nulls) | join("/") ), ( [ ( .OCIManifest // .SchemaV2Manifest ).layers[].size ] | add ) ] | join(" ")' | numfmt --to iec --format '%.2f' --field 2 | sort | column -t ; } cmd download-size "$IMG" @@ -116,3 +116,4 @@ jobs: local-size() { docker system df -v | grep "$1" -B1; } cmd local-size "$REP" emd '```' + continue-on-error: true diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 118a7a2..7a7317b 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -29,7 +29,7 @@ jobs: - name: dep-size qnm (flat list as in node_modules) run: | emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } - cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } + cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' cmd bunx --yes qnm doctor emd '```' From 656f746626f207aa9144838855fd47c62e46c798 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 17:13:30 +0200 Subject: [PATCH 063/167] only run js/sonarqube for changes to **.js, **.ts, package.json --- .github/workflows/js.yml | 4 ++++ .github/workflows/sonarqube.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 7a7317b..4e52943 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -3,6 +3,10 @@ name: "JS: deps, lint, tests" # Run on push in any branch and changes in PRs. on: push: + paths: + - '**.js' + - '**.ts' + - 'package.json' pull_request: types: [opened, synchronize, reopened] diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index c494468..0cbc0a7 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -3,6 +3,10 @@ name: SonarQube Scan # Run on push in any branch and changes in PRs. on: push: + paths: + - '**.js' + - '**.ts' + - 'package.json' pull_request: types: [opened, synchronize, reopened] From 3329d597b9ac6806b529f7a8158f3d1d53219e7b Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 19:37:00 +0200 Subject: [PATCH 064/167] add healthcheck (just checks for node) to Dockerfile and docker-compose.yml --- Dockerfile | 3 +++ docker-compose.yml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1d773bf..00bc8cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,6 +93,9 @@ ENV DEPTH=24 # Show browser instead of running headless ENV SHOW=1 +# mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and actually check something - for now we just check that node is running... +HEALTHCHECK --interval=10s --timeout=5s CMD pgrep node + # Script to setup display server & VNC is always executed. ENTRYPOINT ["docker-entrypoint.sh"] # Default command to run. This is replaced by appending own command, e.g. `docker run ... node prime-gaming` to only run this script. diff --git a/docker-compose.yml b/docker-compose.yml index dbcc679..476e508 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,10 @@ services: container_name: fgc # is printed in front of every output line image: ghcr.io/vogler/free-games-claimer # otherwise image name will be free-games-claimer-free-games-claimer build: . + healthcheck: # not that useful, but linter complained, see Dockerfile + test: "pgrep node" + interval: 10s + timeout: 5s ports: # - "5900:5900" # VNC server - "6080:6080" # noVNC (browser-based VNC client) From 3e3baa0d3e74cc454f4715a87bd14841b6cb3e82 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 20:00:32 +0200 Subject: [PATCH 065/167] docker healthcheck: check that noVNC is reachable (and node running) --- Dockerfile | 4 ++-- docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00bc8cc..9d08396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,8 +93,8 @@ ENV DEPTH=24 # Show browser instead of running headless ENV SHOW=1 -# mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and actually check something - for now we just check that node is running... -HEALTHCHECK --interval=10s --timeout=5s CMD pgrep node +# mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and check something in JS - for now we just check that node is running and noVNC is reachable... +HEALTHCHECK --interval=5s --timeout=5s CMD pgrep node && curl --fail http://localhost:6080 || exit 1 # Script to setup display server & VNC is always executed. ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 476e508..dd02113 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,9 @@ services: container_name: fgc # is printed in front of every output line image: ghcr.io/vogler/free-games-claimer # otherwise image name will be free-games-claimer-free-games-claimer build: . - healthcheck: # not that useful, but linter complained, see Dockerfile - test: "pgrep node" - interval: 10s + healthcheck: # see Dockerfile, check that node is running and noVNC is reachable + test: pgrep node && curl --fail http://localhost:6080 || exit 1 + interval: 5s timeout: 5s ports: # - "5900:5900" # VNC server From 90cdf04b8ab57d14ca575370741f56c8635dc3db Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 20:38:19 +0200 Subject: [PATCH 066/167] docker: comment on ARG -> ENV --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9d08396..1da4c55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,9 +67,11 @@ COPY . . RUN dos2unix ./*.sh && chmod +x ./*.sh COPY docker-entrypoint.sh /usr/local/bin/ +# set by .github/workflows/docker.yml ARG COMMIT="" ARG BRANCH="" ARG NOW="" +# need as env vars to log in docker-entrypoint.sh ENV COMMIT=${COMMIT} ENV BRANCH=${BRANCH} ENV NOW=${NOW} From a2e1ef60e6d5077ad95cde1250bfcc5077fefb59 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Sun, 25 May 2025 22:11:32 +0200 Subject: [PATCH 067/167] fix 656f746626f207aa9144838855fd47c62e46c798: yaml quotes... --- .github/workflows/js.yml | 6 +++--- .github/workflows/sonarqube.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 4e52943..07cce34 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -4,9 +4,9 @@ name: "JS: deps, lint, tests" on: push: paths: - - '**.js' - - '**.ts' - - 'package.json' + - "**.js" + - "**.ts" + - "package.json" pull_request: types: [opened, synchronize, reopened] diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 0cbc0a7..32adc6d 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -4,9 +4,9 @@ name: SonarQube Scan on: push: paths: - - '**.js' - - '**.ts' - - 'package.json' + - "**.js" + - "**.ts" + - "package.json" pull_request: types: [opened, synchronize, reopened] From 34b24f3eb7952e1b86f91d925a0a02e97cb9c552 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 00:46:09 +0200 Subject: [PATCH 068/167] make patchright work in docker --- Dockerfile | 53 ++++++++++++++++++++------------------------ docker-entrypoint.sh | 23 +++++-------------- epic-games.js | 3 ++- 3 files changed, 32 insertions(+), 47 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1da4c55..17ef9ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FROM mcr.microsoft.com/playwright:v1.20.0 -# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal +# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.jammy FROM ubuntu:jammy # Configuration variables are at the end! @@ -8,9 +8,9 @@ FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG DEBIAN_FRONTEND=noninteractive -# Install up-to-date node & npm, deps for virtual screen & noVNC, firefox, pip for apprise. +# Install nodejs and deps for virtual display, noVNC, chromium, and pip for installing apprise. RUN apt-get update \ - && apt-get install --no-install-recommends -y curl ca-certificates gnupg \ + && apt-get install -y --no-install-recommends curl ca-certificates gnupg \ && mkdir -p /etc/apt/keyrings \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ @@ -23,43 +23,38 @@ RUN apt-get update \ novnc websockify \ dos2unix \ python3-pip \ - # && npx playwright install-deps firefox \ - && apt-get install --no-install-recommends -y \ - libgtk-3-0 \ - libasound2 \ - libxcomposite1 \ - libpangocairo-1.0-0 \ - libpango-1.0-0 \ + # RUN npx patchright install-deps chromium + # ^ installing deps manually instead saved ~130MB: + && apt-get install -y --no-install-recommends \ + libnss3 \ + libnspr4 \ libatk1.0-0 \ - libcairo-gobject2 \ + libatk-bridge2.0-0 \ + libcups2 \ + libxkbcommon0 \ + libatspi2.0-0 \ + libxcomposite1 \ + libgbm1 \ + libpango-1.0-0 \ libcairo2 \ - libgdk-pixbuf-2.0-0 \ - libdbus-glib-1-2 \ - libxcursor1 \ + libasound2 \ && apt-get autoremove -y \ + # https://www.perplexity.ai/search/what-files-do-i-need-to-remove-imjwdphNSUWK98WzsmQswA && apt-get clean \ && rm -rf \ + /var/lib/apt/lists/* \ + /var/cache/* \ + /var/tmp/* \ /tmp/* \ /usr/share/doc/* \ - /var/cache/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# RUN node --version -# RUN npm --version - -RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html -RUN pip install --no-cache-dir apprise + && ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \ + && pip install --no-cache-dir apprise WORKDIR /fgc COPY package*.json ./ -# Playwright installs patched firefox to ~/.cache/ms-playwright/firefox-* -# Requires some system deps to run (see inlined install-deps above). -RUN npm install -# Old: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD + install firefox (had to be done after `npm install` to get the correct version). Now: playwright-firefox as npm dep and `npm install` will only install that. -# From 1.38 Playwright will no longer install browser automatically for playwright, but apparently still for playwright-firefox: https://github.com/microsoft/playwright/releases/tag/v1.38.0 -# RUN npx playwright install firefox +# --no-shell to avoid installing chromium_headless_shell (307MB) since headless mode could be detected without patching the browser itself +RUN npm install && npx patchright install chromium --no-shell && du -h -d1 ~/.cache/ms-playwright COPY . . diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7b321a1..43337cc 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -6,28 +6,16 @@ echo "Version: https://github.com/vogler/free-games-claimer/tree/${COMMIT}" [ -n "$BRANCH" ] && [ "$BRANCH" != "main" ] && echo "Branch: ${BRANCH}" echo "Build: $NOW" +BROWSER="${BROWSER_DIR:-data/browser}" + # Remove chromium profile lock. # When running in docker and then killing it, on the next run chromium displayed a dialog to unlock the profile which made the script time out. # Maybe due to changed hostname of container or due to how the docker container kills playwright - didn't check. # https://bugs.chromium.org/p/chromium/issues/detail?id=367048 -rm -f /fgc/data/browser/SingletonLock - -# Firefox preferences are stored in $BROWSER_DIR/pref.js and can be overridden by a file user.js -# Since this file has to be in the volume (data/browser), we can't do this in Dockerfile. -mkdir -p /fgc/data/browser -# fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 -# echo 'user_pref("privacy.resistFingerprinting", true);' > /fgc/data/browser/user.js -cat </fgc/data/browser/user.js -user_pref("privacy.resistFingerprinting", true); -// user_pref("privacy.resistFingerprinting.letterboxing", true); -// user_pref("browser.contentblocking.category", "strict"); -// user_pref("webgl.disabled", true); -EOT -# TODO disable session restore message? +rm -f /fgc/$BROWSER/SingletonLock # Remove X server display lock, fix for `docker compose up` which reuses container which made it fail after initial run, https://github.com/vogler/free-games-claimer/issues/31 -# echo $DISPLAY -# ls -l /tmp/.X11-unix/ +# Maybe no longer needed after adding #478's -nolisten unix below rm -f /tmp/.X1-lock # 6000+SERVERNUM is the TCP port Xvfb is listening on: @@ -36,10 +24,11 @@ rm -f /tmp/.X1-lock # Options passed directly to the Xvfb server: # -ac disables host-based access control mechanisms # −screen NUM WxHxD creates the screen and sets its width, height, and depth +# -nolisten unix tells the server not to use Unix domain sockets, thus avoiding the need to create /tmp/.X11-unix export DISPLAY=:1 # need to export this, otherwise playwright complains with 'Looks like you launched a headed browser without having a XServer running.' Xvfb $DISPLAY -ac -screen 0 "${WIDTH}x${HEIGHT}x${DEPTH}" & -echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT}" +echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT} -nolisten unix" if [ -z "$VNC_PASSWORD" ]; then pw="-nopw" pwt="no password!" diff --git a/epic-games.js b/epic-games.js index e0841d2..c182e7b 100644 --- a/epic-games.js +++ b/epic-games.js @@ -31,7 +31,8 @@ const context = await chromium.launchPersistentContext(cfg.dir.browser, { args: [ '--hide-crash-restore-bubble', ], - chromiumSandbox: true, // https://github.com/Kaliiiiiiiiii-Vinyzu/patchright/issues/52 + // The following makes the browser crash in docker with 'Chromium sandboxing failed!': + // chromiumSandbox: true, // https://github.com/Kaliiiiiiiiii-Vinyzu/patchright/issues/52 }); // console.log(context.browser().browserType()); // browser is null... From ce5bac6a03ca9a0c768bc28e2fbb6665ea0a06ee Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 01:01:15 +0200 Subject: [PATCH 069/167] eg: ignore SHOW=0 since it leads to captcha --- epic-games.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epic-games.js b/epic-games.js index c182e7b..a69a3e3 100644 --- a/epic-games.js +++ b/epic-games.js @@ -3,7 +3,7 @@ import { chromium } from 'patchright'; import { authenticator } from 'otplib'; import chalk from 'chalk'; import path from 'path'; -import { existsSync, writeFileSync, appendFileSync } from 'fs'; +import { existsSync, writeFileSync } from 'fs'; import { resolve, jsonDb, datetime, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; @@ -21,7 +21,7 @@ if (cfg.time) console.time('startup'); // https://playwright.dev/docs/auth#multi-factor-authentication const context = await chromium.launchPersistentContext(cfg.dir.browser, { // channel: 'chrome', // recommended, but `npx patchright install chrome` clashes with system Chrome - https://github.com/Kaliiiiiiiiii-Vinyzu/patchright-nodejs#best-practice----use-chrome-without-fingerprint-injection - headless: cfg.headless, + headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha viewport: { width: cfg.width, height: cfg.height }, // locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 From 2d5f232ba59b4ce35ac4ee925a9e2e1f0cbbb0cc Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 02:41:17 +0200 Subject: [PATCH 070/167] gog: use patchright, works, but prob. not reliable due to used timeouts; waitFor() broken? --- gog.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gog.js b/gog.js index d6c3ad4..fc0b1ee 100644 --- a/gog.js +++ b/gog.js @@ -1,4 +1,5 @@ -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra +// import { firefox } from 'playwright-firefox'; +import { chromium } from 'patchright'; import chalk from 'chalk'; import { resolve, jsonDb, datetime, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; @@ -17,13 +18,17 @@ if (cfg.width < 1280) { // otherwise 'Sign in' and #menuUsername are hidden (but } // https://playwright.dev/docs/auth#multi-factor-authentication -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, locale: 'en-US', // ignore OS locale to be sure to have english text for locators -> done via /en in URL recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/gog-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + ], }); handleSIGINT(context); @@ -44,9 +49,11 @@ try { // page.click('#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll').catch(_ => { }); // does not work reliably, solved by setting CookieConsent above const signIn = page.locator('a:has-text("Sign in")').first(); - await Promise.any([signIn.waitFor(), page.waitForSelector('#menuUsername')]); - while (await signIn.isVisible()) { - console.error('Not signed in anymore.'); + // TODO for the below signIn.waitFor(), patchright failed most of the time with: locator.waitFor: JSHandles can be evaluated only in the context they were created! + // await Promise.any([signIn.waitFor(), page.waitForSelector('#menuUsername')]); + const username = page.locator('#menuUsername').first(); + while (await signIn.isVisible() && !await username.isVisible()) { + console.error('Not signed!'); if (cfg.nowait) process.exit(1); await signIn.click(); // it then creates an iframe for the login @@ -59,10 +66,14 @@ try { const email = cfg.gog_email || await prompt({ message: 'Enter email' }); const password = email && (cfg.gog_password || await prompt({ type: 'password', message: 'Enter password' })); if (email && password) { - iframe.locator('a[href="/logout"]').click().catch(_ => { }); // Click 'Change account' (email from previous login is set in some cookie) - await iframe.locator('#login_username').fill(email); + // iframe.locator('a[href="/logout"]').click().catch(_ => { }); // Click 'Change account' (email from previous login is set in some cookie) + // TODO above didn't work with patchright + if (!await iframe.locator('#login_username').isDisabled()) { + await iframe.locator('#login_username').fill(email); + } await iframe.locator('#login_password').fill(password); await iframe.locator('#login_login').click(); + await page.waitForTimeout(2000); // TODO patchright waits forever for MFA locator otherwise // handle MFA, but don't await it iframe.locator('form[name=second_step_authentication]').waitFor().then(async () => { console.log('Two-Step Verification - Enter security code'); @@ -97,6 +108,7 @@ try { db.data[user] ||= {}; const banner = page.locator('#giveaway'); + await page.waitForTimeout(2000); // TODO patchright sometimes missed banner otherwise if (!await banner.count()) { console.log('Currently no free giveaway!'); } else { From 29576f0af0ad010493141e3c750d16cde32fc2d9 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 02:42:23 +0200 Subject: [PATCH 071/167] pg: use patchright: elementHandles() broken, didn't test PG_REDEEM --- prime-gaming.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index 23eb2bf..663c987 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -1,7 +1,8 @@ -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra +// import { chromium } from 'playwright-chromium'; +import { chromium } from 'patchright'; import { authenticator } from 'otplib'; import chalk from 'chalk'; -import { resolve, jsonDb, datetime, stealth, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; +import { resolve, jsonDb, datetime, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'prime-gaming', ...a); @@ -14,20 +15,20 @@ console.log(datetime(), 'started checking prime-gaming'); const db = await jsonDb('prime-gaming.json', {}); // https://playwright.dev/docs/auth#multi-factor-authentication -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/pg-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + args: [ + '--hide-crash-restore-bubble', + ], }); handleSIGINT(context); -// TODO test if needed -await stealth(context); - if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist @@ -127,7 +128,7 @@ try { 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 internal = await games.locator('.item-card__action:has(button[data-a-target="FGWPOffer"])').all(); const external = await games.locator('.item-card__action:has(a[data-a-target="FGWPOffer"])').all(); // bottom to top: oldest to newest games internal.reverse(); @@ -155,8 +156,8 @@ try { // 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 title = await (await card.locator('.item-card-details__body__primary')).innerText(); + const slug = await (await card.locator('a')).getAttribute('href'); const url = 'https://gaming.amazon.com' + slug.split('?')[0]; console.log('Current free game:', chalk.blue(title)); if (cfg.pg_timeLeft && await skipBasedOnTime(url)) continue; From 3156c03b03e31e725a0c655ea1da9a99770cb2de Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 02:50:26 +0200 Subject: [PATCH 072/167] fix lint $BROWSER --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 43337cc..8672905 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -12,7 +12,7 @@ BROWSER="${BROWSER_DIR:-data/browser}" # When running in docker and then killing it, on the next run chromium displayed a dialog to unlock the profile which made the script time out. # Maybe due to changed hostname of container or due to how the docker container kills playwright - didn't check. # https://bugs.chromium.org/p/chromium/issues/detail?id=367048 -rm -f /fgc/$BROWSER/SingletonLock +rm -f "/fgc/$BROWSER/SingletonLock" # Remove X server display lock, fix for `docker compose up` which reuses container which made it fail after initial run, https://github.com/vogler/free-games-claimer/issues/31 # Maybe no longer needed after adding #478's -nolisten unix below From 4a19e5775edeb8ca5ec8e8838beaf294aea81199 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Mon, 26 May 2025 23:56:33 +0200 Subject: [PATCH 073/167] aliexpress: use patchright, keep fingerprint-injector for mobile view claiming coins should work, but can only test tomorrow --- aliexpress.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index 468301e..1f8cc2e 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -1,9 +1,9 @@ -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra +// import { firefox } from 'playwright-firefox'; +import { chromium } from 'patchright'; 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... -// from https://github.com/apify/fingerprint-suite/issues/162 +// can probably be removed and hard-code headers for mobile view import { FingerprintInjector } from 'fingerprint-injector'; import { FingerprintGenerator } from 'fingerprint-generator'; @@ -12,13 +12,14 @@ const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({ operatingSystems: ['android'], }); -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, // viewport: { width: cfg.width, height: cfg.height }, locale: 'en-US', // ignore OS locale to be sure to have english text for locators -> done via /en in URL recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/aliexpress-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // e.g. for coins, mobile view is needed, otherwise it just says to install the app userAgent: fingerprint.navigator.userAgent, viewport: { width: fingerprint.screen.width, @@ -27,6 +28,10 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, { extraHTTPHeaders: { 'accept-language': headers['accept-language'], }, + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + ], }); handleSIGINT(context); // await stealth(context); @@ -81,11 +86,14 @@ const urls = { }; const coins = async () => { - // await auth(urls.coins); - await Promise.any([page.locator('.checkin-button').click(), page.locator('.addcoin').waitFor()]); - console.log('Coins:', await page.locator('.mycoin-content-right-money').innerText()); - console.log('Streak:', await page.locator('.title-box').innerText()); - console.log('Tomorrow:', await page.locator('.addcoin').innerText()); + const collectBtn = page.locator('div:has-text("Collect")').first(); + const moreBtn = page.locator('div:has-text("Earn more coins")').first(); + await Promise.any([collectBtn.click(), moreBtn.waitFor()]); + console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); + const n = (await page.locator('.marquee-item:has-text(" coins")').first().innerText()).replace(' coins', ''); + console.log('Coins:', n); + // console.log('Streak:', await page.locator('.title-box').innerText()); + // console.log('Tomorrow:', await page.locator('.addcoin').innerText()); }; // const grow = async () => { From b3bf92c2d9b140e08cf0a4c24dcf2a83c7481993 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 27 May 2025 00:05:13 +0200 Subject: [PATCH 074/167] use patchright in unrealengine and steam-games (both stale) --- steam-games.js | 34 +++++++++++----------------------- unrealengine.js | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/steam-games.js b/steam-games.js index ed54253..4acb4f0 100644 --- a/steam-games.js +++ b/steam-games.js @@ -1,36 +1,24 @@ -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra -import { jsonDb, prompt } from './src/util.js'; +// import { firefox } from 'playwright-firefox'; +import { chromium } from 'patchright'; +import { datetime, filenamify, jsonDb, prompt } from './src/util.js'; import { cfg } from './src/config.js'; const db = await jsonDb('steam-games.json', {}); const user = cfg.steam_id || await prompt({ message: 'Enter Steam community id ("View my profile", then copy from URL)' }); -// using https://github.com/apify/fingerprint-suite worked, but has no launchPersistentContext... -// from https://github.com/apify/fingerprint-suite/issues/162 -import { FingerprintInjector } from 'fingerprint-injector'; -import { FingerprintGenerator } from 'fingerprint-generator'; - -const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({ - devices: ['desktop'], - operatingSystems: ['windows'], -}); - -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, // viewport: { width: cfg.width, height: cfg.height }, 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, - }, - extraHTTPHeaders: { - 'accept-language': headers['accept-language'], - }, + recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 + recordHar: cfg.record ? { path: `data/record/steam-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools + handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + ], }); -// await stealth(context); -await new FingerprintInjector().attachFingerprintToPlaywright(context, { fingerprint, headers }); context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout); diff --git a/unrealengine.js b/unrealengine.js index 2bb8ee9..4fee9ec 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -1,11 +1,12 @@ // TODO This is mostly a copy of epic-games.js // New assets to claim every first Tuesday of a month. -import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra +// import { firefox } from 'playwright-firefox'; +import { chromium } from 'patchright'; import { authenticator } from 'otplib'; import path from 'path'; import { writeFileSync } from 'fs'; -import { resolve, jsonDb, datetime, stealth, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; +import { resolve, jsonDb, datetime, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'unrealengine', ...a); @@ -18,21 +19,21 @@ console.log(datetime(), 'started checking unrealengine'); const db = await jsonDb('unrealengine.json', {}); // https://playwright.dev/docs/auth#multi-factor-authentication -const context = await firefox.launchPersistentContext(cfg.dir.browser, { +const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.83 Safari/537.36', // see replace of Headless in util.newStealthContext. TODO Windows UA enough to avoid 'device not supported'? update if browser is updated? - // userAgent for firefox: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:106.0) Gecko/20100101 Firefox/106.0 - locale: 'en-US', // ignore OS locale to be sure to have english text for locators + locale: 'en-US', // ignore OS locale to be sure to have english text for locators -> done via /en in URL recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 - recordHar: cfg.record ? { path: `data/record/ue-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools + recordHar: cfg.record ? { path: `data/record/gog-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + ], }); handleSIGINT(context); -await stealth(context); - if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist From 6b51d54946936daea89809bd36868b5e2543df08 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 27 May 2025 00:08:00 +0200 Subject: [PATCH 075/167] npm rm playwright-firefox puppeteer-extra-plugin-stealth --- package-lock.json | 786 ++-------------------------------------------- package.json | 4 +- 2 files changed, 31 insertions(+), 759 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e565bd..9a6c636 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,9 +15,7 @@ "fingerprint-injector": "^2.1.66", "lowdb": "^7.0.1", "otplib": "^12.0.1", - "patchright": "^1.52.4", - "playwright-firefox": "^1.52.0", - "puppeteer-extra-plugin-stealth": "^2.11.2" + "patchright": "^1.52.4" }, "devDependencies": { "@stylistic/eslint-plugin": "^4.4.0", @@ -337,15 +335,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "license": "MIT", - "dependencies": { - "@types/ms": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -359,12 +348,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", - "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", - "license": "MIT" - }, "node_modules/@typescript-eslint/scope-manager": { "version": "8.32.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", @@ -591,24 +574,17 @@ "dev": true, "license": "Python-2.0" }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -669,9 +645,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001717", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz", - "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==", + "version": "1.0.30001718", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz", + "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==", "funding": [ { "type": "opencollective", @@ -699,22 +675,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/clone-deep": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz", - "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==", - "license": "MIT", - "dependencies": { - "for-own": "^0.1.3", - "is-plain-object": "^2.0.1", - "kind-of": "^3.0.2", - "lazy-cache": "^1.0.3", - "shallow-clone": "^0.1.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -736,7 +696,8 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -756,6 +717,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -775,15 +737,6 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -812,9 +765,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.150", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz", - "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==", + "version": "1.5.157", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz", + "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==", "license": "ISC" }, "node_modules/enquirer": { @@ -1216,47 +1169,6 @@ "dev": true, "license": "ISC" }, - "node_modules/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==", - "license": "MIT", - "dependencies": { - "for-in": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "license": "ISC" - }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -1281,27 +1193,6 @@ "tslib": "^2.4.0" } }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -1327,12 +1218,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC" - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1393,38 +1278,6 @@ "node": ">=0.8.19" } }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "license": "MIT" - }, - "node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -1465,33 +1318,12 @@ "node": ">=8" } }, - "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1525,18 +1357,6 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -1547,27 +1367,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "license": "MIT", - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -1624,20 +1423,6 @@ "url": "https://github.com/sponsors/typicode" } }, - "node_modules/merge-deep": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", - "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==", - "license": "MIT", - "dependencies": { - "arr-union": "^3.1.0", - "clone-deep": "^0.2.4", - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -1679,6 +1464,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1686,32 +1472,11 @@ "node": "*" } }, - "node_modules/mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==", - "license": "MIT", - "dependencies": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mixin-object/node_modules/for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, "license": "MIT" }, "node_modules/natural-compare": { @@ -1726,15 +1491,6 @@ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "license": "MIT" }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -1863,15 +1619,6 @@ "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -1900,34 +1647,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/playwright-core": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", - "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", - "license": "Apache-2.0", - "bin": { - "playwright-core": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/playwright-firefox": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-firefox/-/playwright-firefox-1.52.0.tgz", - "integrity": "sha512-x4niD4HHffaYNmz0XwgXqvf7NUhCmAbcpa+DX16kAacd+6T8cwf+W/+Q0S+VLsYpQ2BJowR2HuJanO1Ge1Phzg==", - "hasInstallScript": true, - "license": "Apache-2.0", - "dependencies": { - "playwright-core": "1.52.0" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -1947,112 +1666,6 @@ "node": ">=6" } }, - "node_modules/puppeteer-extra-plugin": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin/-/puppeteer-extra-plugin-3.2.3.tgz", - "integrity": "sha512-6RNy0e6pH8vaS3akPIKGg28xcryKscczt4wIl0ePciZENGE2yoaQJNd17UiEbdmh5/6WW6dPcfRWT9lxBwCi2Q==", - "license": "MIT", - "dependencies": { - "@types/debug": "^4.1.0", - "debug": "^4.1.1", - "merge-deep": "^3.0.1" - }, - "engines": { - "node": ">=9.11.2" - }, - "peerDependencies": { - "playwright-extra": "*", - "puppeteer-extra": "*" - }, - "peerDependenciesMeta": { - "playwright-extra": { - "optional": true - }, - "puppeteer-extra": { - "optional": true - } - } - }, - "node_modules/puppeteer-extra-plugin-stealth": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-stealth/-/puppeteer-extra-plugin-stealth-2.11.2.tgz", - "integrity": "sha512-bUemM5XmTj9i2ZerBzsk2AN5is0wHMNE6K0hXBzBXOzP5m5G3Wl0RHhiqKeHToe/uIH8AoZiGhc1tCkLZQPKTQ==", - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "puppeteer-extra-plugin": "^3.2.3", - "puppeteer-extra-plugin-user-preferences": "^2.4.1" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "playwright-extra": "*", - "puppeteer-extra": "*" - }, - "peerDependenciesMeta": { - "playwright-extra": { - "optional": true - }, - "puppeteer-extra": { - "optional": true - } - } - }, - "node_modules/puppeteer-extra-plugin-user-data-dir": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-data-dir/-/puppeteer-extra-plugin-user-data-dir-2.4.1.tgz", - "integrity": "sha512-kH1GnCcqEDoBXO7epAse4TBPJh9tEpVEK/vkedKfjOVOhZAvLkHGc9swMs5ChrJbRnf8Hdpug6TJlEuimXNQ+g==", - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^10.0.0", - "puppeteer-extra-plugin": "^3.2.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "playwright-extra": "*", - "puppeteer-extra": "*" - }, - "peerDependenciesMeta": { - "playwright-extra": { - "optional": true - }, - "puppeteer-extra": { - "optional": true - } - } - }, - "node_modules/puppeteer-extra-plugin-user-preferences": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-preferences/-/puppeteer-extra-plugin-user-preferences-2.4.1.tgz", - "integrity": "sha512-i1oAZxRbc1bk8MZufKCruCEC3CCafO9RKMkkodZltI4OqibLFXF3tj6HZ4LZ9C5vCXZjYcDWazgtY69mnmrQ9A==", - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "deepmerge": "^4.2.2", - "puppeteer-extra-plugin": "^3.2.3", - "puppeteer-extra-plugin-user-data-dir": "^2.4.1" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "playwright-extra": "*", - "puppeteer-extra": "*" - }, - "peerDependenciesMeta": { - "playwright-extra": { - "optional": true - }, - "puppeteer-extra": { - "optional": true - } - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2095,22 +1708,6 @@ "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -2148,42 +1745,6 @@ "node": ">=10" } }, - "node_modules/shallow-clone": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==", - "license": "MIT", - "dependencies": { - "is-extendable": "^0.1.1", - "kind-of": "^2.0.1", - "lazy-cache": "^0.2.3", - "mixin-object": "^2.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/shallow-clone/node_modules/kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==", - "license": "MIT", - "dependencies": { - "is-buffer": "^1.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/shallow-clone/node_modules/lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -2320,15 +1881,6 @@ "node": ">=14.17" } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -2393,12 +1945,6 @@ "node": ">= 8" } }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "license": "ISC" - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -2621,14 +2167,6 @@ } } }, - "@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "requires": { - "@types/ms": "*" - } - }, "@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -2641,11 +2179,6 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, - "@types/ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", - "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==" - }, "@typescript-eslint/scope-manager": { "version": "8.32.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", @@ -2783,20 +2316,17 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==" - }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2828,27 +2358,15 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "caniuse-lite": { - "version": "1.0.30001717", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz", - "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==" + "version": "1.0.30001718", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz", + "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==" }, "chalk": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==" }, - "clone-deep": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz", - "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==", - "requires": { - "for-own": "^0.1.3", - "is-plain-object": "^2.0.1", - "kind-of": "^3.0.2", - "lazy-cache": "^1.0.3", - "shallow-clone": "^0.1.2" - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2867,7 +2385,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "cross-spawn": { "version": "7.0.6", @@ -2884,6 +2403,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, "requires": { "ms": "^2.1.3" } @@ -2894,11 +2414,6 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" - }, "dot-prop": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", @@ -2913,9 +2428,9 @@ "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" }, "electron-to-chromium": { - "version": "1.5.150", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz", - "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==" + "version": "1.5.157", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz", + "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==" }, "enquirer": { "version": "2.4.1", @@ -3183,34 +2698,6 @@ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==", - "requires": { - "for-in": "^1.0.1" - } - }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -3226,19 +2713,6 @@ "tslib": "^2.4.0" } }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, "glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -3254,11 +2728,6 @@ "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3298,30 +2767,6 @@ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==" - }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -3348,25 +2793,12 @@ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -3394,15 +2826,6 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, "keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -3412,19 +2835,6 @@ "json-buffer": "3.0.1" } }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==" - }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -3463,16 +2873,6 @@ "steno": "^4.0.2" } }, - "merge-deep": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", - "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==", - "requires": { - "arr-union": "^3.1.0", - "clone-deep": "^0.2.4", - "kind-of": "^3.0.2" - } - }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3501,30 +2901,16 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==", - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==" - } - } - }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true }, "natural-compare": { "version": "1.4.0", @@ -3537,14 +2923,6 @@ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==" }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, "optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -3628,11 +3006,6 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -3650,19 +3023,6 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true }, - "playwright-core": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", - "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==" - }, - "playwright-firefox": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-firefox/-/playwright-firefox-1.52.0.tgz", - "integrity": "sha512-x4niD4HHffaYNmz0XwgXqvf7NUhCmAbcpa+DX16kAacd+6T8cwf+W/+Q0S+VLsYpQ2BJowR2HuJanO1Ge1Phzg==", - "requires": { - "playwright-core": "1.52.0" - } - }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -3675,48 +3035,6 @@ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true }, - "puppeteer-extra-plugin": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin/-/puppeteer-extra-plugin-3.2.3.tgz", - "integrity": "sha512-6RNy0e6pH8vaS3akPIKGg28xcryKscczt4wIl0ePciZENGE2yoaQJNd17UiEbdmh5/6WW6dPcfRWT9lxBwCi2Q==", - "requires": { - "@types/debug": "^4.1.0", - "debug": "^4.1.1", - "merge-deep": "^3.0.1" - } - }, - "puppeteer-extra-plugin-stealth": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-stealth/-/puppeteer-extra-plugin-stealth-2.11.2.tgz", - "integrity": "sha512-bUemM5XmTj9i2ZerBzsk2AN5is0wHMNE6K0hXBzBXOzP5m5G3Wl0RHhiqKeHToe/uIH8AoZiGhc1tCkLZQPKTQ==", - "requires": { - "debug": "^4.1.1", - "puppeteer-extra-plugin": "^3.2.3", - "puppeteer-extra-plugin-user-preferences": "^2.4.1" - } - }, - "puppeteer-extra-plugin-user-data-dir": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-data-dir/-/puppeteer-extra-plugin-user-data-dir-2.4.1.tgz", - "integrity": "sha512-kH1GnCcqEDoBXO7epAse4TBPJh9tEpVEK/vkedKfjOVOhZAvLkHGc9swMs5ChrJbRnf8Hdpug6TJlEuimXNQ+g==", - "requires": { - "debug": "^4.1.1", - "fs-extra": "^10.0.0", - "puppeteer-extra-plugin": "^3.2.3", - "rimraf": "^3.0.2" - } - }, - "puppeteer-extra-plugin-user-preferences": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-preferences/-/puppeteer-extra-plugin-user-preferences-2.4.1.tgz", - "integrity": "sha512-i1oAZxRbc1bk8MZufKCruCEC3CCafO9RKMkkodZltI4OqibLFXF3tj6HZ4LZ9C5vCXZjYcDWazgtY69mnmrQ9A==", - "requires": { - "debug": "^4.1.1", - "deepmerge": "^4.2.2", - "puppeteer-extra-plugin": "^3.2.3", - "puppeteer-extra-plugin-user-data-dir": "^2.4.1" - } - }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -3735,14 +3053,6 @@ "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -3758,32 +3068,6 @@ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true }, - "shallow-clone": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==", - "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^2.0.1", - "lazy-cache": "^0.2.3", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==", - "requires": { - "is-buffer": "^1.0.2" - } - }, - "lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==" - } - } - }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -3869,11 +3153,6 @@ "dev": true, "peer": true }, - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" - }, "update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -3906,11 +3185,6 @@ "isexe": "^2.0.0" } }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 9400cc7..d0e52cd 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,7 @@ "fingerprint-injector": "^2.1.66", "lowdb": "^7.0.1", "otplib": "^12.0.1", - "patchright": "^1.52.4", - "playwright-firefox": "^1.52.0", - "puppeteer-extra-plugin-stealth": "^2.11.2" + "patchright": "^1.52.4" }, "devDependencies": { "@stylistic/eslint-plugin": "^4.4.0", From 9988f39658483e8c2529be99b34647548e8e0b5d Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 27 May 2025 01:20:29 +0200 Subject: [PATCH 076/167] docker: xvfb needs flag for OpenGL which is needed to solve eg captcha..., #183 --- docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 8672905..d11cdc0 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -27,8 +27,8 @@ rm -f /tmp/.X1-lock # -nolisten unix tells the server not to use Unix domain sockets, thus avoiding the need to create /tmp/.X11-unix export DISPLAY=:1 # need to export this, otherwise playwright complains with 'Looks like you launched a headed browser without having a XServer running.' -Xvfb $DISPLAY -ac -screen 0 "${WIDTH}x${HEIGHT}x${DEPTH}" & -echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT} -nolisten unix" +Xvfb $DISPLAY -ac -screen 0 "${WIDTH}x${HEIGHT}x${DEPTH}" -nolisten unix +extension GLX +extension RENDER & +echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT}" if [ -z "$VNC_PASSWORD" ]; then pw="-nopw" pwt="no password!" From 89cbe704d5859686d6ed7e8fcb4dc92e949311e1 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 27 May 2025 01:38:52 +0200 Subject: [PATCH 077/167] npm run docker:build-log to use buildx and show full log --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index d0e52cd..945d74c 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "main": "index.js", "scripts": { "docker:build": "docker build . -t ghcr.io/vogler/free-games-claimer", + "docker:build-log": "(docker buildx build --progress=plain . -t ghcr.io/vogler/free-games-claimer; docker image ls) 2>&1 | tee data/docker-build.log", "docker": "docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer", "lint": "npx eslint ." }, From 3d25737e0fef6462504b925c2a42a16e7f3d43ec Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 27 May 2025 23:36:15 +0200 Subject: [PATCH 078/167] ae: fix Collect not being clicked before it exits --- aliexpress.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliexpress.js b/aliexpress.js index 1f8cc2e..ec4e09c 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -88,7 +88,8 @@ const urls = { const coins = async () => { const collectBtn = page.locator('div:has-text("Collect")').first(); const moreBtn = page.locator('div:has-text("Earn more coins")').first(); - await Promise.any([collectBtn.click(), moreBtn.waitFor()]); + // await Promise.any([collectBtn.click(), moreBtn.waitFor()]); // this somehow did not make it click the collect button... try moreBtn.isVisible()? + await collectBtn.click().catch(_ => moreBtn.waitFor()); // TODO change this since it's going to delay by timeout if already collected console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); const n = (await page.locator('.marquee-item:has-text(" coins")').first().innerText()).replace(' coins', ''); console.log('Coins:', n); From 4bcd6e013297ae8db4f8fbf11b8f72e6f26f4364 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 28 May 2025 23:12:34 +0200 Subject: [PATCH 079/167] eg: fix unset locale https://github.com/vogler/free-games-claimer/issues/484#issuecomment-2917585429 --- epic-games.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epic-games.js b/epic-games.js index a69a3e3..7d359fa 100644 --- a/epic-games.js +++ b/epic-games.js @@ -23,7 +23,7 @@ const context = await chromium.launchPersistentContext(cfg.dir.browser, { // channel: 'chrome', // recommended, but `npx patchright install chrome` clashes with system Chrome - https://github.com/Kaliiiiiiiiii-Vinyzu/patchright-nodejs#best-practice----use-chrome-without-fingerprint-injection headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha viewport: { width: cfg.width, height: cfg.height }, - // locale: 'en-US', // ignore OS locale to be sure to have english text for locators + locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/eg-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved From 2d0624b33c685eba4b948bd8c6432127a17f0bdc Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 00:35:40 +0200 Subject: [PATCH 080/167] ae: fix auto-login, Collect worked with Promise.any this time https://github.com/vogler/free-games-claimer/issues/484#issuecomment-2915665695 --- aliexpress.js | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index ec4e09c..b226d73 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -47,37 +47,35 @@ const auth = async url => { // redirects to https://login.aliexpress.com/?return_url=https%3A%2F%2Fwww.aliexpress.com%2Fp%2Fcoin-pc-index%2Findex.html await Promise.any([page.waitForURL(/.*login\.aliexpress.com.*/).then(async () => { // manual login - console.error('Not logged in! Will wait for 120s for you to login...'); - // await page.waitForTimeout(120*1000); + console.error('Not logged in! Will wait for 120s for you to login in the browser or terminal...'); + context.setDefaultTimeout(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 - const login = page.locator('.login-container'); + const login = page.locator('#root'); // not universal: .content, .nfm-login const email = cfg.ae_email || await prompt({ message: 'Enter email' }); const emailInput = login.locator('input[label="Email or phone number"]'); await emailInput.fill(email); await emailInput.blur(); // otherwise Continue button stays disabled const continueButton = login.locator('button:has-text("Continue")'); await continueButton.click({ force: true }); // normal click waits for button to no longer be covered by their suggestion menu, so we have to force click somewhere for the menu to close and then click - await continueButton.click(); const password = email && (cfg.ae_password || await prompt({ type: 'password', message: 'Enter password' })); 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())); - await page.waitForURL(url); + const error = login.locator('.nfm-login-input-error-text'); + error.waitFor().then(async _ => console.error('Login error (please restart):', await error.innerText())).catch(_ => console.log('No login error.')); + await page.waitForURL(u => u.toString().startsWith(url)); // e.g. https://m.aliexpress.com/p/coin-index/index.html?_immersiveMode=true&from=pc302 + // TODO the following won't be executed anymore due to the navigation - patchright issue? + context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout); + console.log('Logged in!'); // this should still be printed, but isn't... // 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(_ => {}); - - // await page.locator('#nav-user-account').hover(); - // console.log('Logged in as:', await page.locator('.welcome-name').innerText()); + // page.getByRole('button', { name: 'Accept cookies' }).click().then(_ => console.log('Accepted cookies')).catch(_ => { }); + }), page.locator('.app-game').waitFor()]); }; // copied URLs from AliExpress app on tablet which has menu for the used webview const urls = { - // works with desktop view, but stuck at 100% loading in mobile view: - coins: 'https://www.aliexpress.com/p/coin-pc-index/index.html', // only work with mobile view: + coins: 'https://www.aliexpress.com/p/coin-pc-index/index.html', grow: 'https://m.aliexpress.com/p/ae_fruit/index.html', // firefox: stuck at 60% loading, chrome: loads, but canvas gogo: 'https://m.aliexpress.com/p/gogo-match-cc/index.html', // closes firefox?! // only show notification to install the app @@ -86,10 +84,14 @@ const urls = { }; const coins = async () => { - const collectBtn = page.locator('div:has-text("Collect")').first(); - const moreBtn = page.locator('div:has-text("Earn more coins")').first(); - // await Promise.any([collectBtn.click(), moreBtn.waitFor()]); // this somehow did not make it click the collect button... try moreBtn.isVisible()? - await collectBtn.click().catch(_ => moreBtn.waitFor()); // TODO change this since it's going to delay by timeout if already collected + console.log('Checking coins...'); + const collectBtn = page.locator('.signVersion-panel div:has-text("Collect")').first(); + const moreBtn = page.locator('.signVersion-panel div:has-text("Earn more coins")').first(); + await Promise.any([ + collectBtn.click().then(_ => console.log('Collected coins for today!')), + moreBtn.waitFor().then(_ => console.log('No more coins to collect today!')) + ]); // sometimes did not make it click the collect button... moreBtn.isVisible() as alternative also didn't work + // await collectBtn.click().catch(_ => moreBtn.waitFor()); // TODO change this since it's going to delay by timeout if already collected console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); const n = (await page.locator('.marquee-item:has-text(" coins")').first().innerText()).replace(' coins', ''); console.log('Coins:', n); From 0f72aec1085feac86d276f344cfa7286c7754be3 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 15:57:01 +0200 Subject: [PATCH 081/167] test #483: WebGL hardware accelerated with --ignore-gpu-blocklist --- test/webgl.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 test/webgl.js diff --git a/test/webgl.js b/test/webgl.js new file mode 100644 index 0000000..f71331e --- /dev/null +++ b/test/webgl.js @@ -0,0 +1,28 @@ +import { chromium } from 'patchright'; +import { handleSIGINT, prompt } from '../src/util.js'; +import { cfg } from '../src/config.js'; + +const context = await chromium.launchPersistentContext(cfg.dir.browser, { + headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha + locale: 'en-US', // ignore OS locale to be sure to have english text for locators + recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 + handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + '--ignore-gpu-blocklist', // required for OpenGL to be enabled + ], +}); + +handleSIGINT(context); + +const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist +await page.goto('https://get.webgl.org/'); +console.log(await page.locator('h1').innerText()); +await page.goto('https://webglreport.com/?v=2'); +console.log(await page.locator('tr:has-text("Unmasked Renderer")').innerText()); +console.log('Waiting. You can check chrome://gpu as well via noVNC. Press ctrl-c to quit...') +// without --ignore-gpu-blocklist: OpenGL Disabled, WebGL: Software only, hardware acceleration unavailable. +// Unmasked Renderer: ANGLE (Mesa, llvmpipe (LLVM 15.0.7 128 bits), OpenGL 4.5) +// with --ignore-gpu-blocklist: OpenGL Enabled, WebGL: Hardware accelerated +// Unmasked Renderer: ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (LLVM 10.0.0) (0x0000C0DE)), SwiftShader driver) \ No newline at end of file From d7956ee4370066cdc719070e71a662eccbf0c881 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 16:26:02 +0200 Subject: [PATCH 082/167] eg: #483: also can't solve captcha with OpenGL working --- epic-games.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epic-games.js b/epic-games.js index 7d359fa..a664c1b 100644 --- a/epic-games.js +++ b/epic-games.js @@ -30,6 +30,7 @@ const context = await chromium.launchPersistentContext(cfg.dir.browser, { // https://peter.sh/experiments/chromium-command-line-switches/ args: [ '--hide-crash-restore-bubble', + '--ignore-gpu-blocklist', ], // The following makes the browser crash in docker with 'Chromium sandboxing failed!': // chromiumSandbox: true, // https://github.com/Kaliiiiiiiiii-Vinyzu/patchright/issues/52 @@ -43,7 +44,7 @@ handleSIGINT(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist -await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it +// await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it // some debug info about the page (screen dimensions, user agent, platform) if (cfg.debug) console.debug(await page.evaluate(() => [(({ width, height, availWidth, availHeight }) => ({ width, height, availWidth, availHeight }))(window.screen), navigator.userAgent, navigator.platform, navigator.vendor])); // deconstruct screen needed since `window.screen` prints {}, `window.screen.toString()` '[object Screen]', and can't use some pick function without defining it on `page` From c772df26e9dfc05a44fb9c4f459ae3e0570d038f Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 17:34:43 +0200 Subject: [PATCH 083/167] update readme --- README.md | 56 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index dbd8a72..eecf8cd 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,16 @@

Claims free games periodically on -- logo epic-games [Epic Games Store](https://www.epicgames.com/store/free-games) +- logo epic-games [Epic Games Store](https://www.epicgames.com/store/free-games) - currently only without Docker - logo prime-gaming [Amazon Prime Gaming](https://gaming.amazon.com) - logo gog [GOG](https://www.gog.com) -- logo unrealengine [Unreal Engine (Assets)](https://www.unrealengine.com/marketplace/en-US/assets?count=20&sortBy=effectiveDate&sortDir=DESC&start=0&tag=4910) ([experimental](https://github.com/vogler/free-games-claimer/issues/44), same login as Epic Games) +and some other free stuff (WIP): +- AliExpress coins (reduce prices) +- Google Play points - WIP +- Assets on fab.com (previously unrealengine.com, same login as Epic Games) - WIP +- Microsoft Rewards: points can be spent on e.g. Xbox Game Pass - WIP + Pull requests welcome :) @@ -18,37 +23,46 @@ Pull requests welcome :) _Works on Windows/macOS/Linux._ -Raspberry Pi (3, 4, Zero 2): [requires 64-bit OS](https://github.com/vogler/free-games-claimer/issues/3) like Raspberry Pi OS or Ubuntu (Raspbian won't work since it's 32-bit). +Raspberry Pi (and other SBC): [requires 64-bit OS](https://github.com/vogler/free-games-claimer/issues/3) like Raspberry Pi OS or Ubuntu (Raspbian won't work), but not recommended since it's too slow and may be unreliable. -## How to run -Easy option: [install Docker](https://docs.docker.com/get-docker/) (or [podman](https://podman-desktop.io/)) and run this command in a terminal: +## How to run this? + +### Container + +You can [install Docker](https://docs.docker.com/get-docker/) and run this command in a terminal: ```sh docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer ``` -_This currently gives you a captcha challenge for epic-games. Until [issue #183](https://github.com/vogler/free-games-claimer/issues/183) is fixed, it is recommended to just run `node epic-games` without docker (see below)._ +_This currently gives you a captcha challenge for epic-games. Until [issue #183](https://github.com/vogler/free-games-claimer/issues/183) is fixed, it is recommended to just run `node epic-games` without Docker on a desktop machine (not headless, see below)._ -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"`. +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`. -
- I want to run without Docker or develop locally. +There's also a `docker-compose.yml` which you can use as an alternative with `docker compose up` (or if you need it for Portainer, your NAS, Unraid, ...). + + + +### Without Docker 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 && npx patchright install chromium` -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 +3. Run `npm install && npx patchright install chromium` to install dependencies +4. Optional: notifications are handled by [apprise](https://github.com/caronc/apprise). See its docs for setup instructions (e.g. `pipx install apprise` ([uv](https://github.com/astral-sh/uv) and [pipx](https://github.com/pypa/pipx) are recommended over [pip](https://stackoverflow.com/questions/75608323/how-do-i-solve-error-externally-managed-environment-every-time-i-use-pip-3)) 5. To get updates: `git pull; npm install` 6. Run `node epic-games`, `node prime-gaming`, `node gog`... Patchright/Playwright will download its Chromium 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 patchright install chromium --with-deps`. +If you are missing some dependencies for the browser on your system, you can use `npx patchright install chromium --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. -
+If you don't want to use Docker for quasi-headless mode, you could run inside a virtual machine, on a server (as long as it has a (virtual) display), 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. + +All scripts start an automated Chromium instance, either with the browser GUI shown or hidden (_headless mode_). By default, you won't see any browser open on your host system. +Epic Games is an exception which will always show the browser since otherwise you would get a captcha challenge. - When running inside Docker, the browser will be shown only inside the container. You can open 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). @@ -61,6 +75,7 @@ There will be prompts in the terminal asking you to enter email, password, and a 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.~~ @@ -97,9 +112,11 @@ Available options/variables and their default values: 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' ...`. Alternatively, you can pass a file with `--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)). @@ -107,16 +124,19 @@ You can also `docker cp` your configuration file to `/fgc/data/config.env` in th 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@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. @@ -128,9 +148,11 @@ To get the OTP key, it is easiest to follow the store's guide for adding an auth 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. @@ -145,7 +167,9 @@ Claiming the Amazon Games works out-of-the-box, however, for games on external s ### 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. @@ -169,7 +193,7 @@ TODO: ~~add some server-mode where the script just keeps running and claims game ### Problems? -Check the open [issues](https://github.com/vogler/free-games-claimer/issues) and comment there or open a new issue. +Check the open [issues](https://github.com/vogler/free-games-claimer/issues) and comment there or open a new issue (if it is something new). 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. From abc73964e60a91b949f06f5bc20d40cce299a730 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 17:37:10 +0200 Subject: [PATCH 084/167] ae: fix eslint issues --- aliexpress.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index b226d73..5bef90c 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -48,7 +48,7 @@ const auth = async url => { await Promise.any([page.waitForURL(/.*login\.aliexpress.com.*/).then(async () => { // manual login console.error('Not logged in! Will wait for 120s for you to login in the browser or terminal...'); - context.setDefaultTimeout(120*1000); + context.setDefaultTimeout(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 const login = page.locator('#root'); // not universal: .content, .nfm-login @@ -89,7 +89,7 @@ const coins = async () => { const moreBtn = page.locator('.signVersion-panel div:has-text("Earn more coins")').first(); await Promise.any([ collectBtn.click().then(_ => console.log('Collected coins for today!')), - moreBtn.waitFor().then(_ => console.log('No more coins to collect today!')) + moreBtn.waitFor().then(_ => console.log('No more coins to collect today!')), ]); // sometimes did not make it click the collect button... moreBtn.isVisible() as alternative also didn't work // await collectBtn.click().catch(_ => moreBtn.waitFor()); // TODO change this since it's going to delay by timeout if already collected console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); From d2bfddb5f4cb77a051dd1accb5a5e80393260a57 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 29 May 2025 17:39:47 +0200 Subject: [PATCH 085/167] npx --yes -> bunx --- .github/workflows/js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 07cce34..e151fb2 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -35,10 +35,10 @@ jobs: emd() { echo "$*" | tee -a "$GITHUB_STEP_SUMMARY"; } cmd() { echo "\$ $*" | tee -a "$GITHUB_STEP_SUMMARY"; "$@" | tee -a "$GITHUB_STEP_SUMMARY"; } emd '```console' - cmd bunx --yes qnm doctor + cmd bunx qnm doctor emd '```' # - name: dep-size cost-of-modules # this says total 8.37MB while du says 75MB... - # run: npx --yes npx cost-of-modules --include-dev --no-install + # run: bunx cost-of-modules --include-dev --no-install # https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#example-workflow-that-runs-the-eslint-analysis-tool - name: eslint (sarif output) From 0890a7a073370e98dcd5a46ebe3c5e3893fdefda Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 4 Jun 2025 15:54:19 +0200 Subject: [PATCH 086/167] pg: patchright: .$ -> .locator, fix 29576f0af0ad https://github.com/vogler/free-games-claimer/issues/484#issuecomment-2923360239 --- prime-gaming.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index 663c987..e957a8b 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -163,10 +163,10 @@ try { if (cfg.pg_timeLeft && 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.locator('.tw-button:has-text("Claim")').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'); + // const img = await card.locator('img.tw-image').getAttribute('src'); // console.log('Image:', img); await card.screenshot({ path: screenshot('internal', `${filenamify(title)}.png`) }); } @@ -219,7 +219,7 @@ try { 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 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. + redeem[store] = await page.locator('li:has-text("Click here") a').getAttribute('href'); // full text: Click here to enter your redemption code. } let redeem_url = redeem[store]; if (store == 'gog.com') redeem_url += '/' + code; // to log and notify, but can't use for goto below (captcha) From ba5e51f529f25681928a1b57d908faf6f39d93d7 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 18:08:14 +0200 Subject: [PATCH 087/167] eg: claim mobile games, closes #474 --- epic-games.js | 10 ++++++++ src/config.js | 1 + src/epic-games-mobile.js | 55 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 src/epic-games-mobile.js diff --git a/epic-games.js b/epic-games.js index a664c1b..15148df 100644 --- a/epic-games.js +++ b/epic-games.js @@ -6,6 +6,7 @@ import path from 'path'; import { existsSync, writeFileSync } from 'fs'; import { resolve, jsonDb, datetime, filenamify, prompt, confirm, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; +import { getGames } from './src/epic-games-mobile.js'; const screenshot = (...a) => resolve(cfg.dir.screenshots, 'epic-games', ...a); @@ -146,6 +147,15 @@ try { // i.e. filter data.Catalog.searchStore.elements for .promotions.promotionalOffers being set and build URL with .catalogNs.mappings[0].pageSlug or .urlSlug if not set to some wrong id like it was the case for spirit-of-the-north-f58a66 - this is also what's done here: https://github.com/claabs/epicgames-freegames-node/blob/938a9653ffd08b8284ea32cf01ac8727d25c5d4c/src/puppet/free-games.ts#L138-L213 const urlSlugs = await Promise.all((await game_loc.all()).map(a => a.getAttribute('href'))); const urls = urlSlugs.map(s => 'https://store.epicgames.com' + s); + + // Free mobile games - https://github.com/vogler/free-games-claimer/issues/474 + // https://egs-platform-service.store.epicgames.com/api/v2/public/discover/home?count=10&country=DE&locale=en&platform=android&start=0&store=EGS + if (cfg.eg_mobile) { + console.log('Including mobile games...'); + const mobileGames = await getGames(); + urls.push(...mobileGames.map(x => x.url)); + } + console.log('Free games:', urls); for (const url of urls) { diff --git a/src/config.js b/src/config.js index a9522e9..9d710b8 100644 --- a/src/config.js +++ b/src/config.js @@ -34,6 +34,7 @@ export const cfg = { eg_password: process.env.EG_PASSWORD || process.env.PASSWORD, eg_otpkey: process.env.EG_OTPKEY, eg_parentalpin: process.env.EG_PARENTALPIN, + eg_mobile: process.env.EG_MOBILE != '0', // claim mobile games // auth prime-gaming pg_email: process.env.PG_EMAIL || process.env.EMAIL, pg_password: process.env.PG_PASSWORD || process.env.PASSWORD, diff --git a/src/epic-games-mobile.js b/src/epic-games-mobile.js new file mode 100644 index 0000000..d9acdcc --- /dev/null +++ b/src/epic-games-mobile.js @@ -0,0 +1,55 @@ +// following https://github.com/vogler/free-games-claimer/issues/474 + +const get = async (platform = 'android') => { // or ios + const r = await fetch(`https://egs-platform-service.store.epicgames.com/api/v2/public/discover/home?count=10&country=DE&locale=en&platform=${platform}&start=0&store=EGS`, { + "method": "GET", + }); + const j = await r.json(); + // console.log(j); + return j; +} + +// $ jq '.data[].topicId' -r +// $ jq '.data[] | {topicId,type} | flatten | @tsv' -r +// mobile-android-carousel featured +// mobile-android-featured-breaker featured +// mobile-android-genre-must-play interactiveIconList +// mobile-android-1pp featured +// mobile-android-fn-exp imageOnly +// android-mega-sale interactiveIconList +// mobile-android-free-game freeGame +// mobile-android-genre-action featured +// mobile-android-genre-free interactiveIconList +// mobile-android-genre-paid interactiveIconList +// $ jq '.data[].offers[].content | {slug: .mapping.slug, price: (.purchase[] | {decimal: .price.decimalPrice, type: .purchaseType})}' +// { +// "slug": "dc-heroes-united-android-de4bc2", +// "price": { +// "decimal": 0, +// "type": "Claim" +// } +// } +// { +// "slug": "ashworld-android-abd8de", +// "price": { +// "decimal": 4.79, +// "type": "Purchase" +// } +// } + +const url = s => `https://store.epicgames.com/en-US/p/${s}`; + +export const getPlatformGames = async platform => { + const json = await get(platform); + const free_game = json.data.filter(x => x.type == 'freeGame')[0]; + // console.log(free_game); + return free_game.offers.map(offer => { + const c = offer.content; + // console.log(c.purchase) + return { title: c.title, url: url(c.mapping.slug) }; + }); +}; + +export const getGames = async () => [...await getPlatformGames('android'), ...await getPlatformGames('ios')] + +// console.log(await getGames()); From 17771640f17b45601a2ffa8167dd7a7df3fe0f3a Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 18:17:18 +0200 Subject: [PATCH 088/167] cleanup, eslint --- src/epic-games-mobile.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/epic-games-mobile.js b/src/epic-games-mobile.js index d9acdcc..73fed10 100644 --- a/src/epic-games-mobile.js +++ b/src/epic-games-mobile.js @@ -1,26 +1,22 @@ // following https://github.com/vogler/free-games-claimer/issues/474 const get = async (platform = 'android') => { // or ios - const r = await fetch(`https://egs-platform-service.store.epicgames.com/api/v2/public/discover/home?count=10&country=DE&locale=en&platform=${platform}&start=0&store=EGS`, { - "method": "GET", - }); - const j = await r.json(); - // console.log(j); - return j; -} + const r = await fetch(`https://egs-platform-service.store.epicgames.com/api/v2/public/discover/home?count=10&country=DE&locale=en&platform=${platform}&start=0&store=EGS`); + return await r.json(); +}; // $ jq '.data[].topicId' -r // $ jq '.data[] | {topicId,type} | flatten | @tsv' -r -// mobile-android-carousel featured -// mobile-android-featured-breaker featured -// mobile-android-genre-must-play interactiveIconList -// mobile-android-1pp featured -// mobile-android-fn-exp imageOnly -// android-mega-sale interactiveIconList -// mobile-android-free-game freeGame -// mobile-android-genre-action featured -// mobile-android-genre-free interactiveIconList -// mobile-android-genre-paid interactiveIconList +// mobile-android-carousel featured +// mobile-android-featured-breaker featured +// mobile-android-genre-must-play interactiveIconList +// mobile-android-1pp featured +// mobile-android-fn-exp imageOnly +// android-mega-sale interactiveIconList +// mobile-android-free-game freeGame +// mobile-android-genre-action featured +// mobile-android-genre-free interactiveIconList +// mobile-android-genre-paid interactiveIconList // $ jq '.data[].offers[].content | {slug: .mapping.slug, price: (.purchase[] | {decimal: .price.decimalPrice, type: .purchaseType})}' // { // "slug": "dc-heroes-united-android-de4bc2", @@ -50,6 +46,6 @@ export const getPlatformGames = async platform => { }); }; -export const getGames = async () => [...await getPlatformGames('android'), ...await getPlatformGames('ios')] +export const getGames = async () => [...await getPlatformGames('android'), ...await getPlatformGames('ios')]; // console.log(await getGames()); From eaadf5bc2f3ff6f700583d9c26465f805f83d17b Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 18:21:53 +0200 Subject: [PATCH 089/167] fix eslint for test/webgl.js --- test/webgl.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/webgl.js b/test/webgl.js index f71331e..f5668ff 100644 --- a/test/webgl.js +++ b/test/webgl.js @@ -1,17 +1,17 @@ import { chromium } from 'patchright'; -import { handleSIGINT, prompt } from '../src/util.js'; +import { handleSIGINT } from '../src/util.js'; import { cfg } from '../src/config.js'; const context = await chromium.launchPersistentContext(cfg.dir.browser, { - headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha - locale: 'en-US', // ignore OS locale to be sure to have english text for locators - recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 - handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved - // https://peter.sh/experiments/chromium-command-line-switches/ - args: [ - '--hide-crash-restore-bubble', - '--ignore-gpu-blocklist', // required for OpenGL to be enabled - ], + headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha + locale: 'en-US', // ignore OS locale to be sure to have english text for locators + recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 + handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved + // https://peter.sh/experiments/chromium-command-line-switches/ + args: [ + '--hide-crash-restore-bubble', + '--ignore-gpu-blocklist', // required for OpenGL to be enabled + ], }); handleSIGINT(context); @@ -21,8 +21,8 @@ await page.goto('https://get.webgl.org/'); console.log(await page.locator('h1').innerText()); await page.goto('https://webglreport.com/?v=2'); console.log(await page.locator('tr:has-text("Unmasked Renderer")').innerText()); -console.log('Waiting. You can check chrome://gpu as well via noVNC. Press ctrl-c to quit...') +console.log('Waiting. You can check chrome://gpu as well via noVNC. Press ctrl-c to quit...'); // without --ignore-gpu-blocklist: OpenGL Disabled, WebGL: Software only, hardware acceleration unavailable. // Unmasked Renderer: ANGLE (Mesa, llvmpipe (LLVM 15.0.7 128 bits), OpenGL 4.5) // with --ignore-gpu-blocklist: OpenGL Enabled, WebGL: Hardware accelerated -// Unmasked Renderer: ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (LLVM 10.0.0) (0x0000C0DE)), SwiftShader driver) \ No newline at end of file +// Unmasked Renderer: ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (LLVM 10.0.0) (0x0000C0DE)), SwiftShader driver) From c5f0c203223e4c4fe6cccc50658756ded23c6dd5 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 19:53:26 +0200 Subject: [PATCH 090/167] --enable-unsafe-webgpu, #483 --- epic-games.js | 3 ++- test/webgl.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epic-games.js b/epic-games.js index 15148df..4731a2c 100644 --- a/epic-games.js +++ b/epic-games.js @@ -31,7 +31,8 @@ const context = await chromium.launchPersistentContext(cfg.dir.browser, { // https://peter.sh/experiments/chromium-command-line-switches/ args: [ '--hide-crash-restore-bubble', - '--ignore-gpu-blocklist', + '--ignore-gpu-blocklist', // required for OpenGL: Disabled -> Enabled & WebGL: Software only -> Hardware accelerated + '--enable-unsafe-webgpu', // required for WebGPU: Disabled -> Hardware accelerated ], // The following makes the browser crash in docker with 'Chromium sandboxing failed!': // chromiumSandbox: true, // https://github.com/Kaliiiiiiiiii-Vinyzu/patchright/issues/52 diff --git a/test/webgl.js b/test/webgl.js index f5668ff..754c331 100644 --- a/test/webgl.js +++ b/test/webgl.js @@ -10,7 +10,8 @@ const context = await chromium.launchPersistentContext(cfg.dir.browser, { // https://peter.sh/experiments/chromium-command-line-switches/ args: [ '--hide-crash-restore-bubble', - '--ignore-gpu-blocklist', // required for OpenGL to be enabled + '--ignore-gpu-blocklist', // required for OpenGL: Disabled -> Enabled & WebGL: Software only -> Hardware accelerated + '--enable-unsafe-webgpu', // required for WebGPU: Disabled -> Hardware accelerated ], }); From 4cf2718077a4329b973f811e14cc6dc62c80197e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 21:17:09 +0200 Subject: [PATCH 091/167] use TurboVNC with xfce4 instead of Xvfb+X11vnc, 1.36GB -> 1.51GB total --- Dockerfile | 17 +++++++++++++---- docker-entrypoint.sh | 23 +++++++++-------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17ef9ae..3e20791 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,21 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates gnupg \ && mkdir -p /etc/apt/keyrings \ + # Node.js && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ + # TurboVNC & VirtualGL instead of Xvfb+X11vnc + && curl -fsSL https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \ + && curl -fsSL https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \ + && curl -fssl https://raw.githubusercontent.com/VirtualGL/repo/main/VirtualGL.list > /etc/apt/sources.list.d/VirtualGL.list \ + && curl -fssl https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list > /etc/apt/sources.list.d/TurboVNC.list \ + # update lists and install && apt-get update \ && apt-get install --no-install-recommends -y \ - nodejs \ - xvfb \ - x11vnc \ - tini \ + virtualgl turbovnc xfce4 \ novnc websockify \ + tini \ + nodejs \ dos2unix \ python3-pip \ # RUN npx patchright install-deps chromium @@ -38,6 +44,9 @@ RUN apt-get update \ libpango-1.0-0 \ libcairo2 \ libasound2 \ + # needed for TurboVNC if not installing xfce4: + # libxdamage1 \ + # libxrandr2 \ && apt-get autoremove -y \ # https://www.perplexity.ai/search/what-files-do-i-need-to-remove-imjwdphNSUWK98WzsmQswA && apt-get clean \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index d11cdc0..ae17c11 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -18,26 +18,21 @@ rm -f "/fgc/$BROWSER/SingletonLock" # Maybe no longer needed after adding #478's -nolisten unix below rm -f /tmp/.X1-lock -# 6000+SERVERNUM is the TCP port Xvfb is listening on: -# SERVERNUM=$(echo "$DISPLAY" | sed 's/:\([0-9][0-9]*\).*/\1/') - -# Options passed directly to the Xvfb server: -# -ac disables host-based access control mechanisms -# −screen NUM WxHxD creates the screen and sets its width, height, and depth -# -nolisten unix tells the server not to use Unix domain sockets, thus avoiding the need to create /tmp/.X11-unix - export DISPLAY=:1 # need to export this, otherwise playwright complains with 'Looks like you launched a headed browser without having a XServer running.' -Xvfb $DISPLAY -ac -screen 0 "${WIDTH}x${HEIGHT}x${DEPTH}" -nolisten unix +extension GLX +extension RENDER & -echo "Xvfb display server created screen with resolution ${WIDTH}x${HEIGHT}" if [ -z "$VNC_PASSWORD" ]; then - pw="-nopw" + pw="-SecurityTypes None" pwt="no password!" else - pw="-passwd $VNC_PASSWORD" + # pw="-passwd $VNC_PASSWORD" # not supported anymore + pw="-rfbauth ~/.vnc/passwd" + mkdir ~/.vnc/ + echo "$VNC_PASSWORD" | /opt/TurboVNC/bin/vncpasswd -f > ~/.vnc/passwd pwt="with password" fi -x11vnc -display $DISPLAY -forever -shared -rfbport "$VNC_PORT" -bg "$pw" 2>/dev/null 1>&2 -echo "VNC is running on port $VNC_PORT ($pwt)" +# TurboVNC server replaces Xvfb+x11vnc +/opt/TurboVNC/bin/vncserver $DISPLAY -geometry "${WIDTH}x${HEIGHT}" -depth ${DEPTH} -rfbport ${VNC_PORT} $pw -vgl -log /fgc/data/TurboVNC.log -xstartup /usr/bin/startxfce4 2>/dev/null # -noxstartup -novnc /usr/share/novnc/ +echo "TurboVNC is running on port $VNC_PORT ($pwt) with resolution ${WIDTH}x${HEIGHT}" +# TODO keep websockify just for custom NOVNC_PORT? https://www.perplexity.ai/search/how-to-specify-the-novnc-port-rfv96C9tTZufnyFPRye5xA#0 websockify -D --web "/usr/share/novnc/" "$NOVNC_PORT" "localhost:$VNC_PORT" 2>/dev/null 1>&2 & echo "noVNC (VNC via browser) is running on http://localhost:$NOVNC_PORT" echo From a0545beb3a81a31c37fc879e72b0e55f88c05ee1 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 22:05:12 +0200 Subject: [PATCH 092/167] TurboVNC: run with ratpoison instead of xfce4, 1.51GB -> 1.41GB --- Dockerfile | 5 ++--- docker-entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e20791..27d9074 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update \ # update lists and install && apt-get update \ && apt-get install --no-install-recommends -y \ - virtualgl turbovnc xfce4 \ + virtualgl turbovnc ratpoison \ novnc websockify \ tini \ nodejs \ @@ -45,8 +45,7 @@ RUN apt-get update \ libcairo2 \ libasound2 \ # needed for TurboVNC if not installing xfce4: - # libxdamage1 \ - # libxrandr2 \ + libxdamage1 \ && apt-get autoremove -y \ # https://www.perplexity.ai/search/what-files-do-i-need-to-remove-imjwdphNSUWK98WzsmQswA && apt-get clean \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ae17c11..517b4a3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -30,7 +30,7 @@ else pwt="with password" fi # TurboVNC server replaces Xvfb+x11vnc -/opt/TurboVNC/bin/vncserver $DISPLAY -geometry "${WIDTH}x${HEIGHT}" -depth ${DEPTH} -rfbport ${VNC_PORT} $pw -vgl -log /fgc/data/TurboVNC.log -xstartup /usr/bin/startxfce4 2>/dev/null # -noxstartup -novnc /usr/share/novnc/ +/opt/TurboVNC/bin/vncserver $DISPLAY -geometry "${WIDTH}x${HEIGHT}" -depth ${DEPTH} -rfbport ${VNC_PORT} $pw -vgl -log /fgc/data/TurboVNC.log -xstartup /usr/bin/ratpoison 2>/dev/null # -noxstartup -novnc /usr/share/novnc/ echo "TurboVNC is running on port $VNC_PORT ($pwt) with resolution ${WIDTH}x${HEIGHT}" # TODO keep websockify just for custom NOVNC_PORT? https://www.perplexity.ai/search/how-to-specify-the-novnc-port-rfv96C9tTZufnyFPRye5xA#0 websockify -D --web "/usr/share/novnc/" "$NOVNC_PORT" "localhost:$VNC_PORT" 2>/dev/null 1>&2 & From ce3109c2ee348d0e87d4515652c441d81dedcf22 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 22:20:40 +0200 Subject: [PATCH 093/167] SonarQube: fix curl -L: only allow https redirects --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27d9074..363786f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ RUN apt-get update \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ # TurboVNC & VirtualGL instead of Xvfb+X11vnc - && curl -fsSL https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \ - && curl -fsSL https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \ - && curl -fssl https://raw.githubusercontent.com/VirtualGL/repo/main/VirtualGL.list > /etc/apt/sources.list.d/VirtualGL.list \ - && curl -fssl https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list > /etc/apt/sources.list.d/TurboVNC.list \ + && curl -fsSL --proto "=https" https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \ + && curl -fsSL --proto "=https" https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \ + && curl -fsSL --proto "=https" https://raw.githubusercontent.com/VirtualGL/repo/main/VirtualGL.list > /etc/apt/sources.list.d/VirtualGL.list \ + && curl -fsSL --proto "=https" https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list > /etc/apt/sources.list.d/TurboVNC.list \ # update lists and install && apt-get update \ && apt-get install --no-install-recommends -y \ From ea598c581b6229fc67a8e02b30400f086f263050 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 22:32:52 +0200 Subject: [PATCH 094/167] fix shellcheck --- docker-entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 517b4a3..1e0faef 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -30,7 +30,8 @@ else pwt="with password" fi # TurboVNC server replaces Xvfb+x11vnc -/opt/TurboVNC/bin/vncserver $DISPLAY -geometry "${WIDTH}x${HEIGHT}" -depth ${DEPTH} -rfbport ${VNC_PORT} $pw -vgl -log /fgc/data/TurboVNC.log -xstartup /usr/bin/ratpoison 2>/dev/null # -noxstartup -novnc /usr/share/novnc/ +# shellcheck disable=SC2086 +/opt/TurboVNC/bin/vncserver $DISPLAY -geometry "${WIDTH}x${HEIGHT}" -depth "${DEPTH}" -rfbport "${VNC_PORT}" $pw -vgl -log /fgc/data/TurboVNC.log -xstartup /usr/bin/ratpoison 2>/dev/null # -noxstartup -novnc /usr/share/novnc/ echo "TurboVNC is running on port $VNC_PORT ($pwt) with resolution ${WIDTH}x${HEIGHT}" # TODO keep websockify just for custom NOVNC_PORT? https://www.perplexity.ai/search/how-to-specify-the-novnc-port-rfv96C9tTZufnyFPRye5xA#0 websockify -D --web "/usr/share/novnc/" "$NOVNC_PORT" "localhost:$VNC_PORT" 2>/dev/null 1>&2 & From 33a1a3fe62374f095361de78cf4531fe755d1ceb Mon Sep 17 00:00:00 2001 From: vogler <493741+vogler@users.noreply.github.com> Date: Thu, 5 Jun 2025 20:36:27 +0000 Subject: [PATCH 095/167] [MegaLinter] Apply linters fixes --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1e0faef..58b7eb0 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -26,7 +26,7 @@ else # pw="-passwd $VNC_PASSWORD" # not supported anymore pw="-rfbauth ~/.vnc/passwd" mkdir ~/.vnc/ - echo "$VNC_PASSWORD" | /opt/TurboVNC/bin/vncpasswd -f > ~/.vnc/passwd + echo "$VNC_PASSWORD" | /opt/TurboVNC/bin/vncpasswd -f >~/.vnc/passwd pwt="with password" fi # TurboVNC server replaces Xvfb+x11vnc From 3da02e317416049173434b8cb43675959b5b88da Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 22:41:42 +0200 Subject: [PATCH 096/167] SonarQube: curl lacking --tlsv1.2 as well? --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 363786f..edf02a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ RUN apt-get update \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ # TurboVNC & VirtualGL instead of Xvfb+X11vnc - && curl -fsSL --proto "=https" https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \ - && curl -fsSL --proto "=https" https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \ - && curl -fsSL --proto "=https" https://raw.githubusercontent.com/VirtualGL/repo/main/VirtualGL.list > /etc/apt/sources.list.d/VirtualGL.list \ - && curl -fsSL --proto "=https" https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list > /etc/apt/sources.list.d/TurboVNC.list \ + && curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \ + && curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \ + && curl --proto "=https" --tlsv1.2 -fsSL https://raw.githubusercontent.com/VirtualGL/repo/main/VirtualGL.list > /etc/apt/sources.list.d/VirtualGL.list \ + && curl --proto "=https" --tlsv1.2 -fsSL https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list > /etc/apt/sources.list.d/TurboVNC.list \ # update lists and install && apt-get update \ && apt-get install --no-install-recommends -y \ From b5465e3cb13c18f19c606698a3b3e24eaabbf09c Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Thu, 5 Jun 2025 23:34:36 +0200 Subject: [PATCH 097/167] novnc: autoconnect=true --- Dockerfile | 1 + docker-entrypoint.sh | 2 +- test/webgl.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 55560fb..82f70b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ # Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.noble +# Ubuntu 24.04 LTS (Noble Numbat) FROM ubuntu:noble # Configuration variables are at the end! diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 58b7eb0..2ace652 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -35,6 +35,6 @@ fi echo "TurboVNC is running on port $VNC_PORT ($pwt) with resolution ${WIDTH}x${HEIGHT}" # TODO keep websockify just for custom NOVNC_PORT? https://www.perplexity.ai/search/how-to-specify-the-novnc-port-rfv96C9tTZufnyFPRye5xA#0 websockify -D --web "/usr/share/novnc/" "$NOVNC_PORT" "localhost:$VNC_PORT" 2>/dev/null 1>&2 & -echo "noVNC (VNC via browser) is running on http://localhost:$NOVNC_PORT" +echo "noVNC (VNC via browser) is running on http://localhost:$NOVNC_PORT/?autoconnect=true" echo exec tini -g -- "$@" # https://github.com/krallin/tini/issues/8 node/playwright respond to signals like ctrl-c, but unsure about zombie processes diff --git a/test/webgl.js b/test/webgl.js index 754c331..3f6d00e 100644 --- a/test/webgl.js +++ b/test/webgl.js @@ -4,6 +4,7 @@ import { cfg } from '../src/config.js'; const context = await chromium.launchPersistentContext(cfg.dir.browser, { headless: false, // don't use cfg.headless headless here since SHOW=0 will lead to captcha + viewport: { width: cfg.width, height: cfg.height }, locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved From 4ebbc65286b66eb1bfecd7149deb364cd6d96f79 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Fri, 6 Jun 2025 13:12:13 +0200 Subject: [PATCH 098/167] eg: login is now using two buttons again, #484 --- epic-games.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epic-games.js b/epic-games.js index 4731a2c..3213707 100644 --- a/epic-games.js +++ b/epic-games.js @@ -103,12 +103,12 @@ try { console.error('Incorrect response for captcha!'); }).catch(_ => { }); await page.fill('#email', email); - // await page.click('button[type="submit"]'); login was split in two steps for some time, now email and password are on the same form again + await page.click('button#continue'); // login was split in two steps for some time, then email and password on the same form, now two steps again... const password = email && (cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' })); if (!password) await notifyBrowserLogin(); else { await page.fill('#password', password); - await page.click('button[type="submit"]'); + await page.click('button#sign-in'); } const error = page.locator('#form-error-message'); error.waitFor().then(async () => { From d22b69032fbf49eea7672c5ebf00433e85f1454e Mon Sep 17 00:00:00 2001 From: Eduard Marbach Date: Thu, 12 Jun 2025 22:07:57 +0200 Subject: [PATCH 099/167] fix: ensure path for apprise --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 82f70b2..8086f54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,6 +98,9 @@ ENV DEPTH=24 # Show browser instead of running headless ENV SHOW=1 +# apprise is installed via pipx, so it is in /root/.local/bin +ENV PATH="/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + # mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and check something in JS - for now we just check that node is running and noVNC is reachable... HEALTHCHECK --interval=5s --timeout=5s CMD pgrep node && curl --fail http://localhost:6080 || exit 1 From e623ddc2f25f88adc4eb04ca91beb7079c7113ce Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 18 Jun 2025 14:04:41 +0200 Subject: [PATCH 100/167] pg: redeem: cleanup gog --- prime-gaming.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index e957a8b..d1b8a43 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -239,7 +239,8 @@ try { await page2.click('[type="submit"]'); // click Continue // console.log(await page2.locator('.warning-message').innerText()); // does not exist if there is no warning const r1t = await (await r1).text(); - const reason = JSON.parse(r1t).reason; + const r1j = JSON.parse(r1t); + const reason = r1j.reason; // {"reason":"Invalid or no captcha"} // {"reason":"code_used"} // {"reason":"code_not_found"} @@ -253,22 +254,25 @@ try { redeem_action = 'redeem (not found)'; console.error(' Code was not found!'); } else { // TODO not logged in? need valid unused code to test. + console.log(' Redeeming', r1j.products[0].title); redeem_action = 'redeemed?'; - // console.log(' Redeemed successfully? Please report your Responses (if new) in https://github.com/vogler/free-games-claimer/issues/5'); - console.debug(` Response 1: ${r1t}`); - // then after the click on Redeem there is a POST request which should return {} if claimed successfully + // then after the click on Redeem there is a POST request which returns json + // POST https://redeem.gog.com/v1/bonusCodes/XYZ {productIds: ["1408290682"]} const r2 = page2.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://redeem.gog.com/')); await page2.click('[type="submit"]'); // click Redeem const r2t = await (await r2).text(); - const reason2 = JSON.parse(r2t).reason; - if (r2t == '{}') { + const r2j = JSON.parse(r2t); + // {"type":"async_processing","checkoutUrl":null} + if (r2j?.type == 'async_processing') { + await page2.locator('h1:has-text("Code redeemed successfully!")').waitFor(); redeem_action = 'redeemed'; console.log(' Redeemed successfully.'); db.data[user][title].status = 'claimed and redeemed'; - } else if (reason2?.includes('captcha')) { + } else if (r2j?.reason2?.includes('captcha')) { redeem_action = 'redeem (got captcha)'; console.error(' Got captcha; could not redeem!'); } else { + console.debug(` Response 1: ${r1t}`); console.debug(` Response 2: ${r2t}`); console.log(' Unknown Response 2 - please report in https://github.com/vogler/free-games-claimer/issues/5'); } From 594080e35b6e72acc1d6225080ef24e6c5c19fb2 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 22 Jul 2025 23:10:27 +0200 Subject: [PATCH 101/167] prepend ~/.local/bin to $PATH (instead of replace) for pipx, fixup #497 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8086f54..ab77c51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ ENV DEPTH=24 ENV SHOW=1 # apprise is installed via pipx, so it is in /root/.local/bin -ENV PATH="/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +ENV PATH="/root/.local/bin:$PATH" # mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and check something in JS - for now we just check that node is running and noVNC is reachable... HEALTHCHECK --interval=5s --timeout=5s CMD pgrep node && curl --fail http://localhost:6080 || exit 1 From 27b2aae970677fa1621112e971556a83873c9eaa Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 22 Jul 2025 23:32:57 +0200 Subject: [PATCH 102/167] use pip --break-system-packages instead of pipx ($PATH) instead of apt (old), #497 - 1.46GB`pipx install apprise` -> as is, need to adjust $PATH (now installed for root, note for #478) - 1.45GB `pip install apprise --break-system-packages` - 1.43GB `apt-get install apprise` -> only version 1.7.2 instead of 1.9.3 for pip/pipx --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab77c51..b86a4cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,8 @@ RUN apt-get update \ tini \ nodejs \ dos2unix \ - pipx \ + # use `pip install apprise --break-system-packages` instead of pipx (should be used locally, but we only need one pkg and pipx needs adjustment to $PATH) instead of apt-get's apprise (1.7.2 instead of 1.9.3) + pip \ # RUN npx patchright install-deps chromium # ^ installing deps manually instead saved ~130MB: && apt-get install -y --no-install-recommends \ @@ -56,7 +57,7 @@ RUN apt-get update \ /tmp/* \ /usr/share/doc/* \ && ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \ - && pipx install apprise + && pip install apprise --break-system-packages WORKDIR /fgc COPY package*.json ./ @@ -98,9 +99,6 @@ ENV DEPTH=24 # Show browser instead of running headless ENV SHOW=1 -# apprise is installed via pipx, so it is in /root/.local/bin -ENV PATH="/root/.local/bin:$PATH" - # mega-linter (KICS, Trivy) complained about it missing - usually this checks some API endpoint, for a container that runs ~1min a healthcheck doesn't make that much sense since playwright has timeouts for everything. Could react to SIGUSR1 and check something in JS - for now we just check that node is running and noVNC is reachable... HEALTHCHECK --interval=5s --timeout=5s CMD pgrep node && curl --fail http://localhost:6080 || exit 1 From 06491986667f0641fb566344cc3d5810c81435c2 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 22 Jul 2025 23:42:02 +0200 Subject: [PATCH 103/167] docker: pip: --no-cache-dir --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b86a4cd..5ec1711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ RUN apt-get update \ /tmp/* \ /usr/share/doc/* \ && ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \ - && pip install apprise --break-system-packages + && pip install apprise --break-system-packages --no-cache-dir WORKDIR /fgc COPY package*.json ./ From 7a90ba32a1306aec4228400a97a3efe43ff5376e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 22 Jul 2025 23:48:41 +0200 Subject: [PATCH 104/167] mega-linter: github step summary should now be done by MARKDOWN_SUMMARY_REPORTER --- .github/workflows/mega-linter.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 9ffe049..3e8ca5f 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -201,8 +201,9 @@ jobs: category: mega-linter # https://github.blog/news-insights/product-news/supercharging-github-actions-with-job-summaries/ - - name: Add job summary - if: success() || failure() - run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" + # - name: Add job summary + # if: success() || failure() + # run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" + # above is now done by `MARKDOWN_SUMMARY_REPORTER` after https://github.com/oxsecurity/megalinter/issues/1489 # logs and artifacts are retained for 90 days, workflow run history is retained for 400 days... https://docs.github.com/en/actions/administering-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy From 3ff71a3a60454849013eb73df7d2839efe149c26 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 22 Jul 2025 23:56:10 +0200 Subject: [PATCH 105/167] mega-linter: github step summary not written by MARKDOWN_SUMMARY_REPORTER? --- .github/workflows/mega-linter.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 3e8ca5f..1666739 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -201,9 +201,9 @@ jobs: category: mega-linter # https://github.blog/news-insights/product-news/supercharging-github-actions-with-job-summaries/ - # - name: Add job summary - # if: success() || failure() - # run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" - # above is now done by `MARKDOWN_SUMMARY_REPORTER` after https://github.com/oxsecurity/megalinter/issues/1489 + - name: Add job summary + if: success() || failure() + run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" + # above should be handled by the MARKDOWN_SUMMARY_REPORTER itself after https://github.com/oxsecurity/megalinter/issues/1489, but did not work # logs and artifacts are retained for 90 days, workflow run history is retained for 400 days... https://docs.github.com/en/actions/administering-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy From bf6bad64faa9ddfe0cce78a9db05d91ada1039dc Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:12:42 +0200 Subject: [PATCH 106/167] aliexpress: close popup, closes #493, closes #490 --- aliexpress.js | 1 + 1 file changed, 1 insertion(+) diff --git a/aliexpress.js b/aliexpress.js index 5bef90c..eebbf48 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -85,6 +85,7 @@ const urls = { const coins = async () => { console.log('Checking coins...'); + page.locator('.hideDoubleButton').click().catch(_ => {}); const collectBtn = page.locator('.signVersion-panel div:has-text("Collect")').first(); const moreBtn = page.locator('.signVersion-panel div:has-text("Earn more coins")').first(); await Promise.any([ From ea96ffec19ad019743283a984fab5beae32c79ca Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:21:11 +0200 Subject: [PATCH 107/167] aliexpress: Promise.race mutually exclusive alternatives instead of Promise.any --- aliexpress.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliexpress.js b/aliexpress.js index eebbf48..7673f19 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -88,7 +88,7 @@ const coins = async () => { page.locator('.hideDoubleButton').click().catch(_ => {}); const collectBtn = page.locator('.signVersion-panel div:has-text("Collect")').first(); const moreBtn = page.locator('.signVersion-panel div:has-text("Earn more coins")').first(); - await Promise.any([ + await Promise.race([ collectBtn.click().then(_ => console.log('Collected coins for today!')), moreBtn.waitFor().then(_ => console.log('No more coins to collect today!')), ]); // sometimes did not make it click the collect button... moreBtn.isVisible() as alternative also didn't work From 9c522bd9ecfd3a58e6408cb6ed4ad0adafcf270e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:23:47 +0200 Subject: [PATCH 108/167] npm run deps:update (use `taze` instead of `ncu`) --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 945d74c..6915a00 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,11 @@ "license": "AGPL-3.0-only", "main": "index.js", "scripts": { + "lint": "npx eslint .", "docker:build": "docker build . -t ghcr.io/vogler/free-games-claimer", "docker:build-log": "(docker buildx build --progress=plain . -t ghcr.io/vogler/free-games-claimer; docker image ls) 2>&1 | tee data/docker-build.log", "docker": "docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer", - "lint": "npx eslint ." + "deps:update": "npx taze major -w && npm i" }, "type": "module", "engines": { From 78a65e9c73705449aafe5ad1c1eb5776c2a0e430 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:23:59 +0200 Subject: [PATCH 109/167] deps:update --- package-lock.json | 1300 ++++++++++++--------------------------------- package.json | 10 +- 2 files changed, 352 insertions(+), 958 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a6c636..9152b9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,30 +10,21 @@ "license": "AGPL-3.0-only", "dependencies": { "chalk": "^5.4.1", - "dotenv": "^16.5.0", + "dotenv": "^17.2.0", "enquirer": "^2.4.1", - "fingerprint-injector": "^2.1.66", + "fingerprint-injector": "^2.1.69", "lowdb": "^7.0.1", "otplib": "^12.0.1", - "patchright": "^1.52.4" + "patchright": "^1.52.5" }, "devDependencies": { - "@stylistic/eslint-plugin": "^4.4.0", - "eslint": "^9.27.0" + "@stylistic/eslint-plugin": "^5.2.2", + "eslint": "^9.31.0" }, "engines": { "node": ">=17" } }, - "node_modules/@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", @@ -53,19 +44,33 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@eslint-community/regexpp": { "version": "4.12.1", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -78,9 +83,9 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz", + "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -88,9 +93,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", - "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz", + "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -125,9 +130,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", - "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", + "version": "9.31.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz", + "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==", "dev": true, "license": "MIT", "engines": { @@ -148,13 +153,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", - "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz", + "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.14.0", + "@eslint/core": "^0.15.1", "levn": "^0.4.1" }, "engines": { @@ -166,6 +171,7 @@ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } @@ -175,6 +181,7 @@ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" @@ -183,23 +190,10 @@ "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -210,42 +204,32 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, + "license": "Apache-2.0", "engines": { - "node": ">= 8" + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "node": ">=18.18" }, - "engines": { - "node": ">= 8" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, "node_modules/@otplib/core": { @@ -303,17 +287,18 @@ } }, "node_modules/@stylistic/eslint-plugin": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.4.0.tgz", - "integrity": "sha512-bIh/d9X+OQLCAMdhHtps+frvyjvAM4B1YlSJzcEEhl7wXLIqPar3ngn9DrHhkBOrTA/z9J0bUMtctAspe0dxdQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.2.2.tgz", + "integrity": "sha512-bE2DUjruqXlHYP3Q2Gpqiuj2bHq7/88FnuaS0FjeGGLCy+X6a07bGVuwtiOYnPSLHR6jmx5Bwdv+j7l8H+G97A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/utils": "^8.32.1", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/types": "^8.37.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "estraverse": "^5.3.0", - "picomatch": "^4.0.2" + "picomatch": "^4.0.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -322,24 +307,12 @@ "eslint": ">=9.0.0" } }, - "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", @@ -348,28 +321,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", - "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/visitor-keys": "8.32.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/types": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz", - "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz", + "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==", "dev": true, "license": "MIT", "engines": { @@ -380,119 +335,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz", - "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/visitor-keys": "8.32.1", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.1.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <5.9.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz", - "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.32.1", - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/typescript-estree": "8.32.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz", - "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.32.1", - "eslint-visitor-keys": "^4.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -557,6 +405,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -578,35 +427,24 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/browserslist": { - "version": "4.24.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz", - "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==", + "version": "4.25.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz", + "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==", "funding": [ { "type": "opencollective", @@ -623,8 +461,8 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001716", - "electron-to-chromium": "^1.5.149", + "caniuse-lite": "^1.0.30001726", + "electron-to-chromium": "^1.5.173", "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.3" }, @@ -645,9 +483,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001718", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz", - "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==", + "version": "1.0.30001727", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", + "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==", "funding": [ { "type": "opencollective", @@ -680,6 +518,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -691,19 +530,22 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -735,7 +577,8 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/dot-prop": { "version": "6.0.1", @@ -753,9 +596,9 @@ } }, "node_modules/dotenv": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", - "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "version": "17.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.0.tgz", + "integrity": "sha512-Q4sgBT60gzd0BB0lSyYD3xM4YxrXA9y4uBDof1JNYGzOXrQdQ6yX+7XIAqoFOGQFOTK1D3Hts5OllpxMDZFONQ==", "license": "BSD-2-Clause", "engines": { "node": ">=12" @@ -765,9 +608,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.157", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz", - "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==", + "version": "1.5.181", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.181.tgz", + "integrity": "sha512-+ISMj8OIQ+0qEeDj14Rt8WwcTOiqHyAB+5bnK1K7xNNLjBJ4hRCQfUkw8RWtcLbfBzDwc15ZnKH0c7SNOfwiyA==", "license": "ISC" }, "node_modules/enquirer": { @@ -796,6 +639,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -804,19 +648,19 @@ } }, "node_modules/eslint": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", - "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", + "version": "9.31.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz", + "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.14.0", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.3.0", + "@eslint/core": "^0.15.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.27.0", + "@eslint/js": "9.31.0", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -828,9 +672,9 @@ "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -865,9 +709,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -882,35 +726,24 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, + "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@humanwhocodes/retry": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", - "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", - "dev": true, - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -922,27 +755,16 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -951,23 +773,12 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -993,6 +804,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -1014,36 +826,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -1055,17 +837,8 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } + "license": "MIT" }, "node_modules/file-entry-cache": { "version": "8.0.0", @@ -1080,24 +853,12 @@ "node": ">=16.0.0" } }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -1110,13 +871,13 @@ } }, "node_modules/fingerprint-generator": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/fingerprint-generator/-/fingerprint-generator-2.1.66.tgz", - "integrity": "sha512-2CvoY+OPcCOWkoIMQim80uNH+ED1+2rM9QXIcSih7ovBMLOmyr3Sp9IOtfccd05QlGDzulU2M9Oav8jOgTlCBA==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/fingerprint-generator/-/fingerprint-generator-2.1.69.tgz", + "integrity": "sha512-Sfd2cLmvVVkzVYvC8+DZWiawquksAbAzrx9+AllpLOg8qlH8votU/Ozx59Z+/70GGQDlEsk48zo7FF5S5vuTEA==", "license": "Apache-2.0", "dependencies": { - "generative-bayesian-network": "^2.1.66", - "header-generator": "^2.1.66", + "generative-bayesian-network": "^2.1.69", + "header-generator": "^2.1.69", "tslib": "^2.4.0" }, "engines": { @@ -1124,12 +885,12 @@ } }, "node_modules/fingerprint-injector": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/fingerprint-injector/-/fingerprint-injector-2.1.66.tgz", - "integrity": "sha512-h5llsoG0xoDeEo2czjzvo1niEU0xgCMwhs5/jtAxiBf7IiP/wW1Is3DJMEB+4V4PwIvqNQqLlnD07X23D7tErA==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/fingerprint-injector/-/fingerprint-injector-2.1.69.tgz", + "integrity": "sha512-zoqMhYGJ8AkhjbC90xOLbqNSprxFeB6Mq5cIL5aBdE3U7l8RXqNu7LhHAyAZaRn0GLcoeQm8AOjxMMQtil4Ihg==", "license": "Apache-2.0", "dependencies": { - "fingerprint-generator": "^2.1.66", + "fingerprint-generator": "^2.1.69", "tslib": "^2.4.0" }, "engines": { @@ -1163,9 +924,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, @@ -1184,9 +945,9 @@ } }, "node_modules/generative-bayesian-network": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.66.tgz", - "integrity": "sha512-gbBsyaaEJj/LHp3473TQrMDdcKiRzI8Sn2CbcG/lwONZkp0n9/ChC1mjzcbZQtHHCuqjn+JouSSbzLeepUMbuw==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.69.tgz", + "integrity": "sha512-k8GgdPT9oCRchU4+7ofh/qpsmvSaOI0znFt/edanyWBBxLjSnjoSU97C15fGqQSdJIZ9uwsCU0RO8xnpLEX95w==", "license": "Apache-2.0", "dependencies": { "adm-zip": "^0.5.9", @@ -1198,6 +959,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -1223,18 +985,19 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/header-generator": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.66.tgz", - "integrity": "sha512-g0jd79o0CyzyK0Jega4pAG1eJhykhPNfBLpOnUINtX2YkToVvRSBZ+B2wtmIjqwKHXK8DNWxylKuXnZmLs1yMQ==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.69.tgz", + "integrity": "sha512-J3BK8UtPAR1Lvvfd/qlzmAS1Qb6Q2qx4K1s4FjYVrYvSQnUc7GgOAo9uacebg6WGCdP0eWxtojh7JwEd+AD2Hw==", "license": "Apache-2.0", "dependencies": { "browserslist": "^4.21.1", - "generative-bayesian-network": "^2.1.66", + "generative-bayesian-network": "^2.1.69", "ow": "^0.28.1", "tslib": "^2.4.0" }, @@ -1274,6 +1037,7 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -1283,6 +1047,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1292,6 +1057,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -1299,16 +1065,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -1322,7 +1078,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/js-yaml": { "version": "4.1.0", @@ -1355,7 +1112,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/keyv": { "version": "4.5.4", @@ -1372,6 +1130,7 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -1385,6 +1144,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -1406,7 +1166,8 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lowdb": { "version": "7.0.1", @@ -1423,48 +1184,12 @@ "url": "https://github.com/sponsors/typicode" } }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1483,7 +1208,8 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { "version": "2.0.19", @@ -1492,17 +1218,18 @@ "license": "MIT" }, "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, + "license": "MIT", "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" }, "engines": { "node": ">= 0.8.0" @@ -1542,6 +1269,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -1557,6 +1285,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -1581,12 +1310,12 @@ } }, "node_modules/patchright": { - "version": "1.52.4", - "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.4.tgz", - "integrity": "sha512-ik/12EM0eVVA1W1TRsxC4ji+ViWYMhlsjQ/EOhHu4XpPndiiMyvoem9m6uPntzdVAq82QyuqtfRXhc1bwzHe1g==", + "version": "1.52.5", + "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.5.tgz", + "integrity": "sha512-wmRpsF9n02j0S+YDk0U3ouuWipHbUowwxbf/4K4G9ng311vvugoo8WndbU/fCsGtme8gYNfcEGcpfF6/L1NXHg==", "license": "Apache-2.0", "dependencies": { - "patchright-core": "1.52.4" + "patchright-core": "1.52.5" }, "bin": { "patchright": "cli.js" @@ -1599,9 +1328,9 @@ } }, "node_modules/patchright-core": { - "version": "1.52.4", - "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.4.tgz", - "integrity": "sha512-mZJBcjaB/UjR3+uw9stpmKXUfjXCLWWmqHfrye5Tk6ye12UGkG51CUG46bqPXmDr/ujR7g9zoG16R4bmsmrSdw==", + "version": "1.52.5", + "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.5.tgz", + "integrity": "sha512-8rnLVEK9jDZWzFPy2hCQrp4xhU7zgE8IqseZyjGkgxf+jpAWTuGNgIAlcsKZMfQrDL8j1mZgRIGNAQT00nk6QA==", "license": "Apache-2.0", "bin": { "patchright-core": "cli.js" @@ -1615,6 +1344,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1624,6 +1354,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1635,9 +1366,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", "engines": { @@ -1652,6 +1383,7 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -1666,27 +1398,6 @@ "node": ">=6" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -1697,59 +1408,12 @@ "node": ">=4" } }, - "node_modules/reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -1762,6 +1426,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1807,6 +1472,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1822,32 +1488,6 @@ "node": ">=0.2.6" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/ts-api-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", - "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.12" - }, - "peerDependencies": { - "typescript": ">=4.8.4" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -1859,6 +1499,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -1866,21 +1507,6 @@ "node": ">= 0.8.0" } }, - "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -1935,6 +1561,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -1945,11 +1572,22 @@ "node": ">= 8" } }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -1959,12 +1597,6 @@ } }, "dependencies": { - "@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true - }, "@eslint-community/eslint-utils": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", @@ -1972,6 +1604,14 @@ "dev": true, "requires": { "eslint-visitor-keys": "^3.4.3" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + } } }, "@eslint-community/regexpp": { @@ -1981,9 +1621,9 @@ "dev": true }, "@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", "dev": true, "requires": { "@eslint/object-schema": "^2.1.6", @@ -1992,15 +1632,15 @@ } }, "@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz", + "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==", "dev": true }, "@eslint/core": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", - "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz", + "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==", "dev": true, "requires": { "@types/json-schema": "^7.0.15" @@ -2024,9 +1664,9 @@ } }, "@eslint/js": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", - "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", + "version": "9.31.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz", + "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==", "dev": true }, "@eslint/object-schema": { @@ -2036,12 +1676,12 @@ "dev": true }, "@eslint/plugin-kit": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", - "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz", + "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==", "dev": true, "requires": { - "@eslint/core": "^0.14.0", + "@eslint/core": "^0.15.1", "levn": "^0.4.1" } }, @@ -2059,6 +1699,14 @@ "requires": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" + }, + "dependencies": { + "@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true + } } }, "@humanwhocodes/module-importer": { @@ -2068,37 +1716,11 @@ "dev": true }, "@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, "@otplib/core": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz", @@ -2147,30 +1769,23 @@ "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" }, "@stylistic/eslint-plugin": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.4.0.tgz", - "integrity": "sha512-bIh/d9X+OQLCAMdhHtps+frvyjvAM4B1YlSJzcEEhl7wXLIqPar3ngn9DrHhkBOrTA/z9J0bUMtctAspe0dxdQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.2.2.tgz", + "integrity": "sha512-bE2DUjruqXlHYP3Q2Gpqiuj2bHq7/88FnuaS0FjeGGLCy+X6a07bGVuwtiOYnPSLHR6jmx5Bwdv+j7l8H+G97A==", "dev": true, "requires": { - "@typescript-eslint/utils": "^8.32.1", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/types": "^8.37.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "estraverse": "^5.3.0", - "picomatch": "^4.0.2" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true - } + "picomatch": "^4.0.3" } }, "@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", "dev": true }, "@types/json-schema": { @@ -2179,92 +1794,16 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, - "@typescript-eslint/scope-manager": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", - "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/visitor-keys": "8.32.1" - } - }, "@typescript-eslint/types": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz", - "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz", + "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==", "dev": true }, - "@typescript-eslint/typescript-estree": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz", - "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/visitor-keys": "8.32.1", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.1.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "@typescript-eslint/utils": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz", - "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.32.1", - "@typescript-eslint/types": "8.32.1", - "@typescript-eslint/typescript-estree": "8.32.1" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "8.32.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz", - "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==", - "dev": true, - "requires": { - "@typescript-eslint/types": "8.32.1", - "eslint-visitor-keys": "^4.2.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true - } - } - }, "acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true }, "acorn-jsx": { @@ -2323,31 +1862,22 @@ "dev": true }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "requires": { - "fill-range": "^7.1.1" - } - }, "browserslist": { - "version": "4.24.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz", - "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==", + "version": "4.25.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz", + "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==", "requires": { - "caniuse-lite": "^1.0.30001716", - "electron-to-chromium": "^1.5.149", + "caniuse-lite": "^1.0.30001726", + "electron-to-chromium": "^1.5.173", "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.3" } @@ -2358,9 +1888,9 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "caniuse-lite": { - "version": "1.0.30001718", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz", - "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==" + "version": "1.0.30001727", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", + "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==" }, "chalk": { "version": "5.4.1", @@ -2423,14 +1953,14 @@ } }, "dotenv": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", - "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" + "version": "17.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.0.tgz", + "integrity": "sha512-Q4sgBT60gzd0BB0lSyYD3xM4YxrXA9y4uBDof1JNYGzOXrQdQ6yX+7XIAqoFOGQFOTK1D3Hts5OllpxMDZFONQ==" }, "electron-to-chromium": { - "version": "1.5.157", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz", - "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==" + "version": "1.5.181", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.181.tgz", + "integrity": "sha512-+ISMj8OIQ+0qEeDj14Rt8WwcTOiqHyAB+5bnK1K7xNNLjBJ4hRCQfUkw8RWtcLbfBzDwc15ZnKH0c7SNOfwiyA==" }, "enquirer": { "version": "2.4.1", @@ -2453,18 +1983,18 @@ "dev": true }, "eslint": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", - "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", + "version": "9.31.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz", + "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.14.0", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.3.0", + "@eslint/core": "^0.15.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.27.0", + "@eslint/js": "9.31.0", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -2476,9 +2006,9 @@ "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2495,12 +2025,6 @@ "optionator": "^0.9.3" }, "dependencies": { - "@humanwhocodes/retry": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", - "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", - "dev": true - }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -2510,19 +2034,13 @@ "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } - }, - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true } } }, "eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -2530,34 +2048,26 @@ } }, "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true }, "espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, "requires": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true - } + "eslint-visitor-keys": "^4.2.1" } }, "esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, "requires": { "estraverse": "^5.1.0" @@ -2590,30 +2100,6 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - } - } - }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -2626,15 +2112,6 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, - "fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, "file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -2644,15 +2121,6 @@ "flat-cache": "^4.0.0" } }, - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -2664,21 +2132,21 @@ } }, "fingerprint-generator": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/fingerprint-generator/-/fingerprint-generator-2.1.66.tgz", - "integrity": "sha512-2CvoY+OPcCOWkoIMQim80uNH+ED1+2rM9QXIcSih7ovBMLOmyr3Sp9IOtfccd05QlGDzulU2M9Oav8jOgTlCBA==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/fingerprint-generator/-/fingerprint-generator-2.1.69.tgz", + "integrity": "sha512-Sfd2cLmvVVkzVYvC8+DZWiawquksAbAzrx9+AllpLOg8qlH8votU/Ozx59Z+/70GGQDlEsk48zo7FF5S5vuTEA==", "requires": { - "generative-bayesian-network": "^2.1.66", - "header-generator": "^2.1.66", + "generative-bayesian-network": "^2.1.69", + "header-generator": "^2.1.69", "tslib": "^2.4.0" } }, "fingerprint-injector": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/fingerprint-injector/-/fingerprint-injector-2.1.66.tgz", - "integrity": "sha512-h5llsoG0xoDeEo2czjzvo1niEU0xgCMwhs5/jtAxiBf7IiP/wW1Is3DJMEB+4V4PwIvqNQqLlnD07X23D7tErA==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/fingerprint-injector/-/fingerprint-injector-2.1.69.tgz", + "integrity": "sha512-zoqMhYGJ8AkhjbC90xOLbqNSprxFeB6Mq5cIL5aBdE3U7l8RXqNu7LhHAyAZaRn0GLcoeQm8AOjxMMQtil4Ihg==", "requires": { - "fingerprint-generator": "^2.1.66", + "fingerprint-generator": "^2.1.69", "tslib": "^2.4.0" } }, @@ -2693,9 +2161,9 @@ } }, "flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true }, "fsevents": { @@ -2705,9 +2173,9 @@ "optional": true }, "generative-bayesian-network": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.66.tgz", - "integrity": "sha512-gbBsyaaEJj/LHp3473TQrMDdcKiRzI8Sn2CbcG/lwONZkp0n9/ChC1mjzcbZQtHHCuqjn+JouSSbzLeepUMbuw==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/generative-bayesian-network/-/generative-bayesian-network-2.1.69.tgz", + "integrity": "sha512-k8GgdPT9oCRchU4+7ofh/qpsmvSaOI0znFt/edanyWBBxLjSnjoSU97C15fGqQSdJIZ9uwsCU0RO8xnpLEX95w==", "requires": { "adm-zip": "^0.5.9", "tslib": "^2.4.0" @@ -2735,12 +2203,12 @@ "dev": true }, "header-generator": { - "version": "2.1.66", - "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.66.tgz", - "integrity": "sha512-g0jd79o0CyzyK0Jega4pAG1eJhykhPNfBLpOnUINtX2YkToVvRSBZ+B2wtmIjqwKHXK8DNWxylKuXnZmLs1yMQ==", + "version": "2.1.69", + "resolved": "https://registry.npmjs.org/header-generator/-/header-generator-2.1.69.tgz", + "integrity": "sha512-J3BK8UtPAR1Lvvfd/qlzmAS1Qb6Q2qx4K1s4FjYVrYvSQnUc7GgOAo9uacebg6WGCdP0eWxtojh7JwEd+AD2Hw==", "requires": { "browserslist": "^4.21.1", - "generative-bayesian-network": "^2.1.66", + "generative-bayesian-network": "^2.1.69", "ow": "^0.28.1", "tslib": "^2.4.0" } @@ -2782,12 +2250,6 @@ "is-extglob": "^2.1.1" } }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -2873,30 +2335,6 @@ "steno": "^4.0.2" } }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "requires": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "dependencies": { - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - } - } - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2924,17 +2362,17 @@ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==" }, "optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, "requires": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" } }, "otplib": { @@ -2987,18 +2425,18 @@ } }, "patchright": { - "version": "1.52.4", - "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.4.tgz", - "integrity": "sha512-ik/12EM0eVVA1W1TRsxC4ji+ViWYMhlsjQ/EOhHu4XpPndiiMyvoem9m6uPntzdVAq82QyuqtfRXhc1bwzHe1g==", + "version": "1.52.5", + "resolved": "https://registry.npmjs.org/patchright/-/patchright-1.52.5.tgz", + "integrity": "sha512-wmRpsF9n02j0S+YDk0U3ouuWipHbUowwxbf/4K4G9ng311vvugoo8WndbU/fCsGtme8gYNfcEGcpfF6/L1NXHg==", "requires": { "fsevents": "2.3.2", - "patchright-core": "1.52.4" + "patchright-core": "1.52.5" } }, "patchright-core": { - "version": "1.52.4", - "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.4.tgz", - "integrity": "sha512-mZJBcjaB/UjR3+uw9stpmKXUfjXCLWWmqHfrye5Tk6ye12UGkG51CUG46bqPXmDr/ujR7g9zoG16R4bmsmrSdw==" + "version": "1.52.5", + "resolved": "https://registry.npmjs.org/patchright-core/-/patchright-core-1.52.5.tgz", + "integrity": "sha512-8rnLVEK9jDZWzFPy2hCQrp4xhU7zgE8IqseZyjGkgxf+jpAWTuGNgIAlcsKZMfQrDL8j1mZgRIGNAQT00nk6QA==" }, "path-exists": { "version": "4.0.0", @@ -3018,9 +2456,9 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true }, "prelude-ls": { @@ -3035,39 +2473,12 @@ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, - "reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true - }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -3116,22 +2527,6 @@ "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==" }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "ts-api-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", - "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", - "dev": true, - "requires": {} - }, "tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -3146,13 +2541,6 @@ "prelude-ls": "^1.2.1" } }, - "typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", - "dev": true, - "peer": true - }, "update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", @@ -3185,6 +2573,12 @@ "isexe": "^2.0.0" } }, + "word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true + }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 6915a00..c3dd76e 100644 --- a/package.json +++ b/package.json @@ -23,15 +23,15 @@ }, "dependencies": { "chalk": "^5.4.1", - "dotenv": "^16.5.0", + "dotenv": "^17.2.0", "enquirer": "^2.4.1", - "fingerprint-injector": "^2.1.66", + "fingerprint-injector": "^2.1.69", "lowdb": "^7.0.1", "otplib": "^12.0.1", - "patchright": "^1.52.4" + "patchright": "^1.52.5" }, "devDependencies": { - "@stylistic/eslint-plugin": "^4.4.0", - "eslint": "^9.27.0" + "@stylistic/eslint-plugin": "^5.2.2", + "eslint": "^9.31.0" } } From 8c46b2eb69d407696b57e2658c84a82da8915189 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:33:00 +0200 Subject: [PATCH 110/167] dotenv: disable log of what it has loaded which was added in 16.6.0 https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md#1660-2025-06-26 --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 9d710b8..ac296c7 100644 --- a/src/config.js +++ b/src/config.js @@ -1,7 +1,7 @@ import * as dotenv from 'dotenv'; import { dataDir } from './util.js'; -dotenv.config({ path: 'data/config.env' }); // loads env vars from file - will not set vars that are already set, i.e., can overwrite values from file by prefixing, e.g., VAR=VAL node ... +dotenv.config({ path: 'data/config.env', quiet: true }); // loads env vars from file - will not set vars that are already set, i.e., can overwrite values from file by prefixing, e.g., VAR=VAL node ... // Options - also see table in README.md export const cfg = { From d36722a45508b8e4a9aa6ee72a9da7a43cf3f687 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:36:11 +0200 Subject: [PATCH 111/167] docker: sonar: npm install --ignore-scripts https://sonarcloud.io/project/security_hotspots?id=vogler_free-games-claimer&branch=dev&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ec1711..c80e65b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,7 +63,7 @@ WORKDIR /fgc COPY package*.json ./ # --no-shell to avoid installing chromium_headless_shell (307MB) since headless mode could be detected without patching the browser itself -RUN npm install && npx patchright install chromium --no-shell && du -h -d1 ~/.cache/ms-playwright +RUN npm install --ignore-scripts && npx patchright install chromium --no-shell && du -h -d1 ~/.cache/ms-playwright COPY . . From da8e160586e415f9114646306b23b491262478c8 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:37:16 +0200 Subject: [PATCH 112/167] eg: fix missing timeEnd for claim in case of cfg.interactive --- epic-games.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epic-games.js b/epic-games.js index 3213707..7a3de1a 100644 --- a/epic-games.js +++ b/epic-games.js @@ -266,7 +266,10 @@ try { if (cfg.time) console.timeEnd('claim game'); continue; } - if (cfg.interactive && !await confirm()) continue; + if (cfg.interactive && !await confirm()) { + if (cfg.time) console.timeEnd('claim game'); + continue; + } // Playwright clicked before button was ready to handle event, https://github.com/vogler/free-games-claimer/issues/84#issuecomment-1474346591 await iframe.locator('button:has-text("Place Order"):not(:has(.payment-loading--loading))').click({ delay: 11 }); From 9ad61a18f2208942fe1c2e8e86ea622f2518a66a Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 00:49:00 +0200 Subject: [PATCH 113/167] fixed randomly renamed @stylistic/eslint-plugin rule... --- eslint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.js b/eslint.config.js index 6b0c640..074068c 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -39,7 +39,7 @@ export default [ '@stylistic/comma-spacing': 'error', '@stylistic/comma-style': 'error', '@stylistic/eol-last': 'error', - '@stylistic/func-call-spacing': 'error', + '@stylistic/function-call-spacing': 'error', '@stylistic/function-paren-newline': ['error', 'consistent'], '@stylistic/implicit-arrow-linebreak': 'error', '@stylistic/indent': ['error', 2], From 37a0635cb8e1fbea4768acec6556f99576a58259 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 01:42:16 +0200 Subject: [PATCH 114/167] aliexpress: fix login --- aliexpress.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index 7673f19..e3c3a5a 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -44,12 +44,16 @@ const page = context.pages().length ? context.pages()[0] : await context.newPage 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 - await Promise.any([page.waitForURL(/.*login\.aliexpress.com.*/).then(async () => { - // manual login + // no longer redirects if not authed, but replaces content -> click button "Log in" which then redirects + const loginBtn = page.locator('button:has-text("Log in")'); + const loggedIn = page.locator('h3:text-is("day streak")'); + await Promise.race([loginBtn.waitFor().then(async () => { + // offer manual login console.error('Not logged in! Will wait for 120s for you to login in the browser or terminal...'); context.setDefaultTimeout(120 * 1000); - // or try automated + // and try automated + await loginBtn.click(); + page.getByRole('button', { name: 'Accept cookies' }).click().then(_ => console.log('Accepted cookies')).catch(_ => { }); 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('#root'); // not universal: .content, .nfm-login const email = cfg.ae_email || await prompt({ message: 'Enter email' }); @@ -61,21 +65,19 @@ const auth = async url => { const password = email && (cfg.ae_password || await prompt({ type: 'password', message: 'Enter password' })); await login.locator('input[label="Password"]').fill(password); await login.locator('button:has-text("Sign in")').click(); + // TODO handle failed login const error = login.locator('.nfm-login-input-error-text'); error.waitFor().then(async _ => console.error('Login error (please restart):', await error.innerText())).catch(_ => console.log('No login error.')); - await page.waitForURL(u => u.toString().startsWith(url)); // e.g. https://m.aliexpress.com/p/coin-index/index.html?_immersiveMode=true&from=pc302 - // TODO the following won't be executed anymore due to the navigation - patchright issue? + await page.waitForURL(u => u.toString().startsWith('https://www.aliexpress.com/')); context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout); console.log('Logged in!'); // this should still be printed, but isn't... - // 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('.app-game').waitFor()]); + }), loggedIn.waitFor()]); // some alternative element which is only there once logged in }; // copied URLs from AliExpress app on tablet which has menu for the used webview const urls = { // only work with mobile view: - coins: 'https://www.aliexpress.com/p/coin-pc-index/index.html', + coins: 'https://m.aliexpress.com/p/coin-index/index.html', grow: 'https://m.aliexpress.com/p/ae_fruit/index.html', // firefox: stuck at 60% loading, chrome: loads, but canvas gogo: 'https://m.aliexpress.com/p/gogo-match-cc/index.html', // closes firefox?! // only show notification to install the app From 114b44e225c26a7a684699a2578d3c5ec1793420 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 02:25:28 +0200 Subject: [PATCH 115/167] aliexpress: fix claiming coins --- aliexpress.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index e3c3a5a..9965d51 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -88,18 +88,21 @@ const urls = { const coins = async () => { console.log('Checking coins...'); page.locator('.hideDoubleButton').click().catch(_ => {}); - const collectBtn = page.locator('.signVersion-panel div:has-text("Collect")').first(); - const moreBtn = page.locator('.signVersion-panel div:has-text("Earn more coins")').first(); + const collectBtn = page.locator('button:has-text("Collect")'); + const moreBtn = page.locator('button:has-text("Earn more coins")'); await Promise.race([ - collectBtn.click().then(_ => console.log('Collected coins for today!')), + // need force because button is visable and enabled but not stable (changes size) + collectBtn.click({ force: true }).then(_ => console.log('Collected coins for today!')), moreBtn.waitFor().then(_ => console.log('No more coins to collect today!')), - ]); // sometimes did not make it click the collect button... moreBtn.isVisible() as alternative also didn't work - // await collectBtn.click().catch(_ => moreBtn.waitFor()); // TODO change this since it's going to delay by timeout if already collected - console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); - const n = (await page.locator('.marquee-item:has-text(" coins")').first().innerText()).replace(' coins', ''); - console.log('Coins:', n); - // console.log('Streak:', await page.locator('.title-box').innerText()); - // console.log('Tomorrow:', await page.locator('.addcoin').innerText()); + ]); + // print more info + const streak = Number(await page.locator('h3:text-is("day streak")').locator('xpath=..').locator('div span').innerText()); + console.log('Streak (days):', streak); + const tomorrow = Number((await page.locator(':text("coins tomorrow")').innerText()).replace(/Get (\d+) check-in coins tomorrow!/, '$1')); + console.log('Tomorrow (coins):', tomorrow); + // console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); + const coins = await page.locator(':text("€")').first().innerText(); // TODO get coins value from somewhere (composed of rotating digits in divs...) + console.log('Total (coins):', coins); }; // const grow = async () => { From 4c96341b90c9bb89e1139e05815642981886a7eb Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 10:20:20 +0200 Subject: [PATCH 116/167] aliexpress: optional pre_auth to start to wait for API responses (needed for number of coins) --- aliexpress.js | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index 9965d51..128de9b 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -85,8 +85,27 @@ const urls = { merge: 'https://m.aliexpress.com/p/merge-market/index.html', }; +// need to start to wait for responses from API already before auth() +const pre_auth = { + coins: async _ => { + console.log('Checking coins...'); + let userCoinsNum; // can make this global or pass as arg if needed; for now we just log the value + let d; // response data (log in case of exception) + // coins are only present as rotating digits in DOM -> no easy way to get value + // number of coins are retrieved via POST to https://acs.aliexpress.com/h5/mtop.aliexpress.coin.execute/1.0/?jsv=2.6.1&appKey=...&t=1753253986320&sign=...&api=mtop.aliexpress.coin.execute&v=1.0&post=1&type=originaljson&dataType=jsonp -> .data.data.find(d => d.name == 'userCoinsNum').value + // however, there are two requests with same method/URL (usually the first is what we need, but sometimes it comes second) which only differ in the opaque value of the sign URL param + await page.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://acs.aliexpress.com/h5/mtop.aliexpress.coin.execute/')).then(async r => { + d = await r.json(); + d = d.data.data; + if (Array.isArray(d)) + userCoinsNum = d.find(e => e.name == 'userCoinsNum')?.value; + console.log('Total (coins):', userCoinsNum); + }).catch(e => console.error('Total (coins): error:', e, 'data:', d)); + } +} + const coins = async () => { - console.log('Checking coins...'); + console.log('Collecting coins...'); page.locator('.hideDoubleButton').click().catch(_ => {}); const collectBtn = page.locator('button:has-text("Collect")'); const moreBtn = page.locator('button:has-text("Earn more coins")'); @@ -101,8 +120,8 @@ const coins = async () => { const tomorrow = Number((await page.locator(':text("coins tomorrow")').innerText()).replace(/Get (\d+) check-in coins tomorrow!/, '$1')); console.log('Tomorrow (coins):', tomorrow); // console.log(await page.locator('.marquee-content:has-text(" coins")').first().innerText()); - const coins = await page.locator(':text("€")').first().innerText(); // TODO get coins value from somewhere (composed of rotating digits in divs...) - console.log('Total (coins):', coins); + const euro = await page.locator(':text("€")').first().innerText(); // TODO get coins value from somewhere (composed of rotating digits in divs...) + console.log('Total (€):', euro); }; // const grow = async () => { @@ -130,7 +149,9 @@ try { // euro, // merge, ].reduce((a, f) => a.then(async _ => { - await auth(urls[f.name]); + const prep = (pre_auth[f.name] ?? (_ => undefined))(); // start to wait for API responses (if needed for f) before anything else + await auth(urls[f.name]); // authenticate + await prep; // after auth (which goes to right url), need to await, otherwise f may finish before prep is done await f(); console.log(); }), Promise.resolve()); From 73a38a16007cf26abee1ea106ebc93be3291c8a4 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 10:30:37 +0200 Subject: [PATCH 117/167] mega-linter: beta instead of v8.7.0 to test GHA step summary support --- .github/workflows/mega-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 1666739..dbbcbce 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -61,7 +61,7 @@ jobs: # You can override MegaLinter flavor used to have faster performances # More info at https://megalinter.io/latest/flavors/ # uses: oxsecurity/megalinter@v8 # default (127 linters) - uses: oxsecurity/megalinter/flavors/cupcake@v8.7.0 # most common, was recommended in output (88 linters) + uses: oxsecurity/megalinter/flavors/cupcake@beta # most common, was recommended in output (88 linters) id: ml From fd7958fe2493938bf6c3785d036d3292f1a1116e Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 10:40:44 +0200 Subject: [PATCH 118/167] mega-linter: GHA step summary supported by beta (also now has expandable details in md) --- .github/workflows/mega-linter.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index dbbcbce..619e8a5 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -61,7 +61,7 @@ jobs: # You can override MegaLinter flavor used to have faster performances # More info at https://megalinter.io/latest/flavors/ # uses: oxsecurity/megalinter@v8 # default (127 linters) - uses: oxsecurity/megalinter/flavors/cupcake@beta # most common, was recommended in output (88 linters) + uses: oxsecurity/megalinter/flavors/cupcake@beta # most common, was recommended in output (88 linters); switched from v8.7.0 to beta for new features id: ml @@ -201,9 +201,9 @@ jobs: category: mega-linter # https://github.blog/news-insights/product-news/supercharging-github-actions-with-job-summaries/ - - name: Add job summary - if: success() || failure() - run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" - # above should be handled by the MARKDOWN_SUMMARY_REPORTER itself after https://github.com/oxsecurity/megalinter/issues/1489, but did not work + # - name: Add job summary + # if: success() || failure() + # run: cat "megalinter-reports/megalinter-report.md" >> "$GITHUB_STEP_SUMMARY" + # the above is now handled by the MARKDOWN_SUMMARY_REPORTER itself after https://github.com/oxsecurity/megalinter/issues/1489 (available in beta) # logs and artifacts are retained for 90 days, workflow run history is retained for 400 days... https://docs.github.com/en/actions/administering-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy From f7e4d058040bf5d22ff4dbeae951bd14d96a4358 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 23 Jul 2025 10:48:58 +0200 Subject: [PATCH 119/167] aliexpress: fix eslint --- aliexpress.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/aliexpress.js b/aliexpress.js index 128de9b..a723c08 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -97,12 +97,11 @@ const pre_auth = { await page.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://acs.aliexpress.com/h5/mtop.aliexpress.coin.execute/')).then(async r => { d = await r.json(); d = d.data.data; - if (Array.isArray(d)) - userCoinsNum = d.find(e => e.name == 'userCoinsNum')?.value; + if (Array.isArray(d)) userCoinsNum = d.find(e => e.name == 'userCoinsNum')?.value; console.log('Total (coins):', userCoinsNum); }).catch(e => console.error('Total (coins): error:', e, 'data:', d)); - } -} + }, +}; const coins = async () => { console.log('Collecting coins...'); From faf3a590a4a889c23ca31a25a557df22df56b123 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Tue, 28 Oct 2025 15:39:25 +0100 Subject: [PATCH 120/167] pg: gaming.amazon.com -> luna.amazon.com --- prime-gaming.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index d1b8a43..7572c78 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -8,7 +8,8 @@ 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 BASE_URL = 'https://luna.amazon.com'; +const URL_CLAIM = `${BASE_URL}/claims/home`; console.log(datetime(), 'started checking prime-gaming'); @@ -84,7 +85,7 @@ try { process.exit(1); } } - await page.waitForURL('https://gaming.amazon.com/home?signedIn=true'); + await page.waitForURL(`${BASE_URL}/claims/home?signedIn=true`); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); } user = await page.locator('[data-a-target="user-dropdown-first-name-text"]').first().innerText(); @@ -158,7 +159,7 @@ try { await card.scrollIntoViewIfNeeded(); const title = await (await card.locator('.item-card-details__body__primary')).innerText(); const slug = await (await card.locator('a')).getAttribute('href'); - const url = 'https://gaming.amazon.com' + slug.split('?')[0]; + const url = BASE_URL + slug.split('?')[0]; console.log('Current free game:', chalk.blue(title)); if (cfg.pg_timeLeft && await skipBasedOnTime(url)) continue; if (cfg.dryrun) continue; @@ -176,7 +177,7 @@ try { 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]; + const url = BASE_URL + slug.split('?')[0]; // await (await card.$('text=Claim')).click(); // goes to URL of game, no need to wait external_info.push({ title, url }); } @@ -381,7 +382,7 @@ try { const dlcs = await Promise.all(cards.map(async card => ({ game: await card.locator('.item-card-details__body p').innerText(), title: await card.locator('.item-card-details__body__primary').innerText(), - url: 'https://gaming.amazon.com' + await card.locator('a').first().getAttribute('href'), + url: BASE_URL + await card.locator('a').first().getAttribute('href'), }))); // console.log(dlcs); From d7146c3905ab02d4b4be8ac42c890e341b6f4455 Mon Sep 17 00:00:00 2001 From: Ralf Vogler Date: Wed, 29 Oct 2025 06:56:16 +0100 Subject: [PATCH 121/167] docker: chromium now needs libxfixes3, despite no version changes..., fixes #551 --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c80e65b..0bb30bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ RUN apt-get update \ libpango-1.0-0 \ libcairo2 \ libasound2t64 \ + libxfixes3 \ # needed for TurboVNC if not installing xfce4: libxdamage1 \ && apt-get autoremove -y \ From faf22aafb1db5c51af6bbad32abc2be2ad1274a3 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 11:41:09 +0000 Subject: [PATCH 122/167] =?UTF-8?q?=F0=9F=90=9B=20fix(prime-gaming):=20upd?= =?UTF-8?q?ate=20URL=20and=20selectors=20for=20claims?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - change URL_CLAIM to point to new Luna claims home - update selectors for sign-in and user verification - improve handling of cookies acceptance ✨ feat(prime-gaming): enhance game claiming logic - add support for new layout and game list detection - implement flexible scrolling for loading all game cards - refine logic for internal and external game claims - improve store identification for external claims ♻️ refactor(prime-gaming): modularize game tab and list location - extract functions for opening games tab and locating games list - enhance code readability and maintainability 🐛 fix(prime-gaming): handle dynamic selectors for availability dates - support multiple selectors for availability date detection - improve error handling and logging for missing elements --- prime-gaming.js | 156 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 125 insertions(+), 31 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index dada15f..8e755b8 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'); @@ -40,9 +40,14 @@ let user; try { await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); // default 'load' takes forever // 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))); + 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")').count() > 0) { + 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 @@ -85,7 +90,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,15 +124,83 @@ 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")', + '[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 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(() => document.scrollingElement?.scrollHeight ?? 0)); + + const cards = []; + 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) { + let url = href; + if (url.startsWith('/')) url = 'https://luna.amazon.com' + url; + const title = url.split('/claims/')[1]?.split('/')[0] || (await anchorClaims.first().innerText()) || 'Unknown title'; + cards.push({ kind: 'external', title, url }); + } + } + + 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://gaming.amazon.com' + 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")'); + if (hasLinkClaim) cards.push({ kind: 'external', title, url }); + else if (hasButtonClaim) cards.push({ kind: 'internal', title, url, handle }); + } + } + } + + const internal = cards.filter(c => c.kind == 'internal'); + const external = cards.filter(c => c.kind == 'external'); // bottom to top: oldest to newest games internal.reverse(); external.reverse(); @@ -143,39 +216,41 @@ try { 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 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' } ]; @@ -183,13 +258,32 @@ try { console.log('Current free game:', chalk.blue(title)); // , url); await page.goto(url, { waitUntil: 'domcontentloaded' }); 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'; + } console.log(' External store:', store); 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 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.click('[data-a-target="buy-box_call-to-action-text"]'), + page.click('p[data-a-target="buy-box_call-to-action-text"]'), + page.waitForSelector('div:has-text("Link game account")'), + page.waitForSelector('.thank-you-title:has-text("Success")'), + ]); // waits for navigation db.data[user][title] ||= { title, time: datetime(), url, store }; const notify_game = { title, url }; notify_games.push(notify_game); // status is updated below From 76f578e2e6edd24d1ea374ab9736ec92c598a475 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 14:15:22 +0000 Subject: [PATCH 123/167] =?UTF-8?q?=E2=9C=A8=20feat(auth):=20enhance=20aut?= =?UTF-8?q?omatic=20login=20and=20MFA=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add handleMFA function for improved two-step verification - implement direct login page handling with automatic sign-in 🐛 fix(claim): improve game claim process and duplicate prevention - normalize claim URLs and deduplicate by URL - fix various selectors for claim buttons and handle different languages - prevent duplicate game claims by checking existing records ♻️ refactor(utils): improve code readability and maintainability - extract normalizeClaimUrl function for URL handling - restructure logic for claim and notification processes 🌐 i18n(claim): add support for game claim text in German - handle German text for claim buttons and status checks --- prime-gaming.js | 230 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 199 insertions(+), 31 deletions(-) diff --git a/prime-gaming.js b/prime-gaming.js index 8e755b8..dc39bba 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -37,8 +37,53 @@ 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")', @@ -70,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.'); @@ -128,6 +166,7 @@ try { 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")', ]; @@ -138,6 +177,15 @@ try { 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 }; @@ -163,15 +211,38 @@ try { if (games) await scrollUntilStable(() => games.evaluate(el => el.scrollHeight).catch(() => 0)); await scrollUntilStable(() => page.evaluate(() => 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) { - let url = href; - if (url.startsWith('/')) url = 'https://luna.amazon.com' + url; - const title = url.split('/claims/')[1]?.split('/')[0] || (await anchorClaims.first().innerText()) || 'Unknown title'; - cards.push({ kind: 'external', title, url }); + const { url, key } = normalizeClaimUrl(href); + const title = key || (await anchorClaims.first().innerText()) || 'Unknown title'; + cards.push({ kind: 'external', title, url, key }); } } @@ -190,17 +261,28 @@ try { 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://gaming.amazon.com' + url; + 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")'); - if (hasLinkClaim) cards.push({ kind: 'external', title, url }); - else if (hasButtonClaim) cards.push({ kind: 'internal', title, url, handle }); + 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 }); } } } - const internal = cards.filter(c => c.kind == 'internal'); - const external = cards.filter(c => c.kind == 'external'); + // 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(); @@ -254,9 +336,46 @@ try { 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(); let store = 'unknown'; const detailLoc = page.locator('[data-a-target="DescriptionItemDetails"], [data-testid="DescriptionItemDetails"]'); @@ -270,23 +389,59 @@ try { 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 clickCTA(page); 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.click('[data-a-target="buy-box_call-to-action-text"]'), - page.click('p[data-a-target="buy-box_call-to-action-text"]'), - page.waitForSelector('div:has-text("Link game account")'), - page.waitForSelector('.thank-you-title:has-text("Success")'), - ]); // waits for navigation + 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!'); @@ -308,7 +463,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. @@ -441,11 +610,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 From a21dced86ec47540efc722cb43ce900343509bc7 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 14:31:25 +0000 Subject: [PATCH 124/167] =?UTF-8?q?=F0=9F=93=A6=20build(ci):=20add=20build?= =?UTF-8?q?-and-push=20workflow=20for=20docker=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - create a new CI workflow to automate image building and pushing - trigger workflow on push to main branch - include steps for checkout, login, build, and push docker images --- .forgejo/workflows/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .forgejo/workflows/build.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..97fa8a0 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,26 @@ +name: build-and-push + +on: + push: + branches: + - main + +jobs: + docker: + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to registry + run: echo "${{ secrets.REG_TOKEN }}" | docker login "${{ secrets.REGISTRY }}" -u "${{ secrets.REG_USER }}" --password-stdin + + - name: Build image + run: | + docker build -t "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" \ + -t "${{ secrets.REGISTRY_IMAGE }}:latest" . + + - name: Push image + run: | + docker push "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" + docker push "${{ secrets.REGISTRY_IMAGE }}:latest" From 6f778d71ac751dec0f079739141a48c4d11ebf1d Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 14:33:14 +0000 Subject: [PATCH 125/167] =?UTF-8?q?=F0=9F=93=9D=20docs(README):=20add=20in?= =?UTF-8?q?structions=20for=20building=20images=20in=20Forgejo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - include steps for building and pushing Docker images using Forgejo - provide details on setting Forgejo secrets and using self-hosted runners --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 17ec854..5e0ab4d 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,14 @@ _This currently gives you a captcha challenge for epic-games. Until [issue #183] 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`. +### Eigene Images aus Forgejo bauen +Falls du den Fork in einer selbst gehosteten Forgejo-Instanz pflegst: + +- Der Workflow `.forgejo/workflows/build.yml` baut/pusht das Docker-Image auf `push` nach `main`. +- Setze in Forgejo die Secrets `REGISTRY`, `REGISTRY_IMAGE`, `REG_USER`, `REG_TOKEN` (PAT mit Paket-Push). +- Self-hosted Runner mit Docker muss registriert sein (`runs-on: self-hosted`). +- Danach kannst du das Image ziehen, z.B.: `docker pull $REGISTRY_IMAGE:latest`. +

I want to run without Docker or develop locally. From bde0f34a80e8f59dce8b6b8e74b5e5286fda3320 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 14:36:18 +0000 Subject: [PATCH 126/167] =?UTF-8?q?=F0=9F=93=9D=20docs(README):=20simplify?= =?UTF-8?q?=20and=20update=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove detailed setup instructions and history - add quick-start guide for Docker and Docker Compose - update CI and configuration sections - streamline language and formatting for clarity --- README.md | 300 +++++++++++++++--------------------------------------- 1 file changed, 80 insertions(+), 220 deletions(-) diff --git a/README.md b/README.md index 5e0ab4d..be82e97 100644 --- a/README.md +++ b/README.md @@ -1,232 +1,92 @@ -

-logo-free-games-claimer -

+Free Games Claimer (Fork) +========================== -[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=vogler_free-games-claimer&metric=code_smells)](https://sonarcloud.io/project/overview?id=vogler_free-games-claimer) -# free-games-claimer +Automates claiming of free games for: +- Epic Games Store (and Epic-linked assets) +- Amazon Prime Gaming / Luna claims (incl. external stores like GOG, Legacy, Microsoft) +- GOG giveaways +- Optional extras: Steam stats, AliExpress dailies (experimental) -Claims free games periodically on -- [Epic Games Store](https://www.epicgames.com/store/free-games) -- [Amazon Prime Gaming](https://gaming.amazon.com) -- [GOG](https://www.gog.com) -- [Unreal Engine (Assets)](https://www.unrealengine.com/marketplace/en-US/assets?count=20&sortBy=effectiveDate&sortDir=DESC&start=0&tag=4910) ([experimental](https://github.com/vogler/free-games-claimer/issues/44), same login as Epic Games) - +This fork adds a Forgejo CI pipeline and instructions for running the pre-built image from your own registry. -Pull requests welcome :) +Requirements +------------ +- Docker or Podman (empfohlen) **oder** Node.js ≥ 20 zum lokalen Lauf +- (Optional) Python `apprise` für Benachrichtigungen: `pip install apprise` +- Für Playwright: Linux-Desktop-Abhängigkeiten sind im Container enthalten; lokal ggf. `npm install` zieht Firefox mit. -![Telegram Screenshot](https://user-images.githubusercontent.com/493741/214667078-eb5c1877-2bdd-40c1-b94e-4a50d6852c06.png) - -_Works on Windows/macOS/Linux._ - -Raspberry Pi (3, 4, Zero 2): [requires 64-bit OS](https://github.com/vogler/free-games-claimer/issues/3) like Raspberry Pi OS or Ubuntu (Raspbian won't work since it's 32-bit). - -## How to run -Easy option: [install Docker](https://docs.docker.com/get-docker/) (or [podman](https://podman-desktop.io/)) and run this command in a terminal: +Schnellstart (Docker Run) +------------------------- ``` -docker run --rm -it -p 6080:6080 -v fgc:/fgc/data --pull=always ghcr.io/vogler/free-games-claimer +docker run --rm -it \ + -p 6080:6080 \ + -v fgc:/fgc/data \ + -e SHOW=1 \ + :latest \ + node prime-gaming.js +``` +- `` z. B. `git.sky-net.it/nocci/free-games-claimer` +- Ports 6080/5900: noVNC/VNC (nur nötig mit `SHOW=1`) +- Daten/Configs landen in Volume `fgc` unter `/fgc/data` + +Docker Compose Beispiel +----------------------- +```yaml +services: + fgc: + image: :latest + container_name: fgc + environment: + - SHOW=1 # Browser sichtbar via VNC/noVNC + # - PG_EMAIL=... + # - PG_PASSWORD=... + # - PG_OTPKEY=... + volumes: + - fgc:/fgc/data + ports: + - "6080:6080" # noVNC + # - "5900:5900" # VNC optional + command: bash -c "node epic-games; node prime-gaming; node gog" +volumes: + fgc: ``` -_This currently gives you a captcha challenge for epic-games. Until [issue #183](https://github.com/vogler/free-games-claimer/issues/183) is fixed, it is recommended to just run `node epic-games` without docker (see below)._ +CI / eigenes Image +------------------ +- Workflow: `.forgejo/workflows/build.yml` baut/pusht auf `push` nach `main`. +- Secrets in Forgejo setzen: + - `REGISTRY` (z. B. `git.sky-net.it`) + - `REGISTRY_IMAGE` (z. B. `git.sky-net.it/nocci/free-games-claimer`) + - `REG_USER`, `REG_TOKEN` (PAT mit Paket-Push) +- Self-hosted Runner mit Docker-Access (`runs-on: self-hosted`) wird benötigt. -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`. +Konfiguration (Umgebungsvariablen) +---------------------------------- +Typische Optionen: +- `SHOW=0/1` (0 = headless, 1 = UI) +- `WIDTH`, `HEIGHT` (Browsergröße) +- `TIMEOUT`, `LOGIN_TIMEOUT` (Sek.) +- Login: `EMAIL`, `PASSWORD` global; spezifisch `EG_EMAIL`, `EG_PASSWORD`, `EG_OTPKEY`, `PG_EMAIL`, `PG_PASSWORD`, `PG_OTPKEY`, `GOG_EMAIL`, `GOG_PASSWORD` +- Prime-Gaming: `PG_REDEEM=1` (Keys automatisch einlösen, experimentell), `PG_CLAIMDLC=1`, `PG_TIMELEFT=` zum Überspringen mit langer Restzeit +- Screenshots: `SCREENSHOTS_DIR` (Standard `data/screenshots`) +- Notifications: `NOTIFY='...'` (Apprise-URL), optional `NOTIFY_TITLE` -### Eigene Images aus Forgejo bauen -Falls du den Fork in einer selbst gehosteten Forgejo-Instanz pflegst: +Du kannst eine `data/config.env` anlegen; sie wird per dotenv geladen und überschreibt nichts, was bereits in der Umgebung gesetzt ist. -- Der Workflow `.forgejo/workflows/build.yml` baut/pusht das Docker-Image auf `push` nach `main`. -- Setze in Forgejo die Secrets `REGISTRY`, `REGISTRY_IMAGE`, `REG_USER`, `REG_TOKEN` (PAT mit Paket-Push). -- Self-hosted Runner mit Docker muss registriert sein (`runs-on: self-hosted`). -- Danach kannst du das Image ziehen, z.B.: `docker pull $REGISTRY_IMAGE:latest`. +Lokal ohne Docker +----------------- +``` +npm install +SHOW=0 PG_EMAIL=... PG_PASSWORD=... PG_OTPKEY=... node prime-gaming.js +``` +- Playwright lädt Firefox beim `npm install` in `~/.cache/ms-playwright`. +- Für sichtbaren Browser `SHOW=1` (GUI/Xvfb nötig). -
- I want to run without Docker or develop locally. +Persistenz & Ausgaben +--------------------- +- Daten & Status: `data/*.json` (pro Store) +- Browserprofil: `data/browser` +- Screenshots: `data/screenshots//` +- Optionale Videos/HAR: `RECORD=1` → `data/record/` -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`... - -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). -
- -[![Star History Chart](https://api.star-history.com/svg?repos=vogler/free-games-claimer&type=Date)](https://star-history.com/#vogler/free-games-claimer&Date) - - -![Alt](https://repobeats.axiom.co/api/embed/a1c5e6e420d90e0d6b34c1285e92a69a44138faa.svg "Repobeats analytics image") - ---- - -Logo with smaller aspect ratio (for Telegram bot etc.): 👾 - [emojipedia](https://emojipedia.org/alien-monster/) - -![logo-fgc](https://user-images.githubusercontent.com/493741/214589922-093d6557-6393-421c-b577-da58ff3671bc.png) +Tipp: Bei Captchas oder Erst-Login `SHOW=1` nutzen und einmal manuell einloggen; Cookies bleiben im Profil. Notifications via `NOTIFY` helfen bei Fehlermeldungen (z. B. Captcha, Login).*** From eba07721ca09a04c0c95e2f9672f87d084c6ee15 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 14:38:54 +0000 Subject: [PATCH 127/167] =?UTF-8?q?=F0=9F=93=9D=20docs(README):=20update?= =?UTF-8?q?=20instructions=20and=20clarify=20configurations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update registry image references to point to `git.sky-net.it/nocci/free-games-claimer` - improve clarity on Docker and Docker Compose examples - translate German sections into English for wider accessibility - add detailed explanations for environment variables and configurations - enhance quickstart and CI instructions for better understanding --- README.md | 83 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index be82e97..8ccf31c 100644 --- a/README.md +++ b/README.md @@ -3,41 +3,40 @@ Free Games Claimer (Fork) Automates claiming of free games for: - Epic Games Store (and Epic-linked assets) -- Amazon Prime Gaming / Luna claims (incl. external stores like GOG, Legacy, Microsoft) +- Amazon Prime Gaming / Luna claims (including external stores like GOG, Legacy, Microsoft) - GOG giveaways - Optional extras: Steam stats, AliExpress dailies (experimental) -This fork adds a Forgejo CI pipeline and instructions for running the pre-built image from your own registry. +This fork adds a Forgejo CI pipeline and instructions for running the pre-built image from the registry at `git.sky-net.it/nocci/free-games-claimer`. Requirements ------------ -- Docker or Podman (empfohlen) **oder** Node.js ≥ 20 zum lokalen Lauf -- (Optional) Python `apprise` für Benachrichtigungen: `pip install apprise` -- Für Playwright: Linux-Desktop-Abhängigkeiten sind im Container enthalten; lokal ggf. `npm install` zieht Firefox mit. +- Docker or Podman (recommended), or Node.js ≥ 20 for local runs +- Optional notifications: `pip install apprise` +- Playwright dependencies are baked into the container; locally, `npm install` downloads Firefox. -Schnellstart (Docker Run) -------------------------- +Quickstart (Docker Run) +----------------------- ``` docker run --rm -it \ -p 6080:6080 \ -v fgc:/fgc/data \ -e SHOW=1 \ - :latest \ + git.sky-net.it/nocci/free-games-claimer:latest \ node prime-gaming.js ``` -- `` z. B. `git.sky-net.it/nocci/free-games-claimer` -- Ports 6080/5900: noVNC/VNC (nur nötig mit `SHOW=1`) -- Daten/Configs landen in Volume `fgc` unter `/fgc/data` +- Ports 6080/5900: noVNC/VNC (only needed with `SHOW=1`) +- Data/configs are stored in volume `fgc` under `/fgc/data` -Docker Compose Beispiel ------------------------ +Docker Compose Example +---------------------- ```yaml services: fgc: - image: :latest + image: git.sky-net.it/nocci/free-games-claimer:latest container_name: fgc environment: - - SHOW=1 # Browser sichtbar via VNC/noVNC + - SHOW=1 # show browser via VNC/noVNC # - PG_EMAIL=... # - PG_PASSWORD=... # - PG_OTPKEY=... @@ -51,42 +50,42 @@ volumes: fgc: ``` -CI / eigenes Image ------------------- -- Workflow: `.forgejo/workflows/build.yml` baut/pusht auf `push` nach `main`. -- Secrets in Forgejo setzen: - - `REGISTRY` (z. B. `git.sky-net.it`) - - `REGISTRY_IMAGE` (z. B. `git.sky-net.it/nocci/free-games-claimer`) - - `REG_USER`, `REG_TOKEN` (PAT mit Paket-Push) -- Self-hosted Runner mit Docker-Access (`runs-on: self-hosted`) wird benötigt. +CI / Build Your Own Image +------------------------- +- Workflow: `.forgejo/workflows/build.yml` builds/pushes on `push` to `main`. +- Secrets needed in Forgejo: + - `REGISTRY` (e.g., `git.sky-net.it`) + - `REGISTRY_IMAGE` (e.g., `git.sky-net.it/nocci/free-games-claimer`) + - `REG_USER`, `REG_TOKEN` (PAT with package push) +- Requires a self-hosted runner with Docker access (`runs-on: self-hosted`). -Konfiguration (Umgebungsvariablen) ----------------------------------- -Typische Optionen: +Configuration (Environment Variables) +------------------------------------- +Common options: - `SHOW=0/1` (0 = headless, 1 = UI) -- `WIDTH`, `HEIGHT` (Browsergröße) -- `TIMEOUT`, `LOGIN_TIMEOUT` (Sek.) -- Login: `EMAIL`, `PASSWORD` global; spezifisch `EG_EMAIL`, `EG_PASSWORD`, `EG_OTPKEY`, `PG_EMAIL`, `PG_PASSWORD`, `PG_OTPKEY`, `GOG_EMAIL`, `GOG_PASSWORD` -- Prime-Gaming: `PG_REDEEM=1` (Keys automatisch einlösen, experimentell), `PG_CLAIMDLC=1`, `PG_TIMELEFT=` zum Überspringen mit langer Restzeit -- Screenshots: `SCREENSHOTS_DIR` (Standard `data/screenshots`) -- Notifications: `NOTIFY='...'` (Apprise-URL), optional `NOTIFY_TITLE` +- `WIDTH`, `HEIGHT` (browser size) +- `TIMEOUT`, `LOGIN_TIMEOUT` (seconds) +- Login: `EMAIL`, `PASSWORD` global; per store `EG_EMAIL`, `EG_PASSWORD`, `EG_OTPKEY`, `PG_EMAIL`, `PG_PASSWORD`, `PG_OTPKEY`, `GOG_EMAIL`, `GOG_PASSWORD` +- Prime Gaming: `PG_REDEEM=1` (auto-redeem keys, experimental), `PG_CLAIMDLC=1`, `PG_TIMELEFT=` to skip long-remaining offers +- Screenshots: `SCREENSHOTS_DIR` (default `data/screenshots`) +- Notifications: `NOTIFY='...'` (Apprise URL), optional `NOTIFY_TITLE` -Du kannst eine `data/config.env` anlegen; sie wird per dotenv geladen und überschreibt nichts, was bereits in der Umgebung gesetzt ist. +You can place a `data/config.env`; it is loaded via dotenv and is overridden by explicitly set environment variables. -Lokal ohne Docker ------------------ +Local Run Without Docker +------------------------ ``` npm install SHOW=0 PG_EMAIL=... PG_PASSWORD=... PG_OTPKEY=... node prime-gaming.js ``` -- Playwright lädt Firefox beim `npm install` in `~/.cache/ms-playwright`. -- Für sichtbaren Browser `SHOW=1` (GUI/Xvfb nötig). +- Playwright downloads Firefox to `~/.cache/ms-playwright`. +- Use `SHOW=1` for a visible browser (requires GUI/Xvfb). -Persistenz & Ausgaben +Persistence & Outputs --------------------- -- Daten & Status: `data/*.json` (pro Store) -- Browserprofil: `data/browser` +- Data/status: `data/*.json` (per store) +- Browser profile: `data/browser` - Screenshots: `data/screenshots//` -- Optionale Videos/HAR: `RECORD=1` → `data/record/` +- Optional videos/HAR: `RECORD=1` → `data/record/` -Tipp: Bei Captchas oder Erst-Login `SHOW=1` nutzen und einmal manuell einloggen; Cookies bleiben im Profil. Notifications via `NOTIFY` helfen bei Fehlermeldungen (z. B. Captcha, Login).*** +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). From eb5b9bbb6e8890e51072c2a592dd14d45a469d83 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 15:01:55 +0000 Subject: [PATCH 128/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20enhance=20d?= =?UTF-8?q?ocker=20build=20process=20with=20buildx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add Docker Buildx setup for advanced build capabilities - update build step to use buildx for multi-platform support --- .forgejo/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 97fa8a0..3aa7b56 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -9,6 +9,9 @@ jobs: docker: runs-on: self-hosted steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Checkout uses: actions/checkout@v4 @@ -17,8 +20,9 @@ jobs: - name: Build image run: | - docker build -t "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" \ - -t "${{ secrets.REGISTRY_IMAGE }}:latest" . + docker buildx build --load \ + -t "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" \ + -t "${{ secrets.REGISTRY_IMAGE }}:latest" . - name: Push image run: | From 0a729d0cbfa562f6913bbe2d7a0085e2da07ab72 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 15:08:00 +0000 Subject: [PATCH 129/167] =?UTF-8?q?=F0=9F=94=A7=20chore(workflow):=20simpl?= =?UTF-8?q?ify=20docker=20image=20tagging=20and=20pushing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove specific sha tag from build and push steps - streamline workflow by focusing on latest tag --- .forgejo/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 3aa7b56..cb83fb0 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -21,10 +21,8 @@ jobs: - name: Build image run: | docker buildx build --load \ - -t "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" \ -t "${{ secrets.REGISTRY_IMAGE }}:latest" . - name: Push image run: | - docker push "${{ secrets.REGISTRY_IMAGE }}:${{ github.sha }}" docker push "${{ secrets.REGISTRY_IMAGE }}:latest" From 9d79f9ac7851f8d4dabdb0cb0e5bc1dd3cc29525 Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 15:54:41 +0000 Subject: [PATCH 130/167] =?UTF-8?q?=F0=9F=93=9D=20docs(README):=20update?= =?UTF-8?q?=20configuration=20and=20remove=20CI=20section?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove outdated CI/build instructions - add new environment variable options for configuration 🐛 fix(util): handle notification errors gracefully - resolve promise instead of rejecting on notification errors - prevent whole run from failing due to notification issues --- README.md | 16 +++++++--------- src/util.js | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8ccf31c..16ac157 100644 --- a/README.md +++ b/README.md @@ -50,15 +50,6 @@ volumes: fgc: ``` -CI / Build Your Own Image -------------------------- -- Workflow: `.forgejo/workflows/build.yml` builds/pushes on `push` to `main`. -- Secrets needed in Forgejo: - - `REGISTRY` (e.g., `git.sky-net.it`) - - `REGISTRY_IMAGE` (e.g., `git.sky-net.it/nocci/free-games-claimer`) - - `REG_USER`, `REG_TOKEN` (PAT with package push) -- Requires a self-hosted runner with Docker access (`runs-on: self-hosted`). - Configuration (Environment Variables) ------------------------------------- Common options: @@ -69,6 +60,13 @@ Common options: - Prime Gaming: `PG_REDEEM=1` (auto-redeem keys, experimental), `PG_CLAIMDLC=1`, `PG_TIMELEFT=` 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) You can place a `data/config.env`; it is loaded via dotenv and is overridden by explicitly set environment variables. diff --git a/src/util.js b/src/util.js index 308952d..49424f8 100644 --- a/src/util.js +++ b/src/util.js @@ -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}`); From e39cca93c23fe1412ca1bdecbbeda45843bd060f Mon Sep 17 00:00:00 2001 From: nocci Date: Mon, 29 Dec 2025 17:19:39 +0100 Subject: [PATCH 131/167] better README.md --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 16ac157..248995e 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,9 @@ Free Games Claimer (Fork) ========================== Automates claiming of free games for: -- Epic Games Store (and Epic-linked assets) -- Amazon Prime Gaming / Luna claims (including external stores like GOG, Legacy, Microsoft) +- Amazon Luna Gaming / Luna claims (including external stores like GOG, Epic Games, Legacy Games ) - GOG giveaways -- Optional extras: Steam stats, AliExpress dailies (experimental) - -This fork adds a Forgejo CI pipeline and instructions for running the pre-built image from the registry at `git.sky-net.it/nocci/free-games-claimer`. +- Optional extras: Steam stats, AliExpress dailies (not implemated yet) Requirements ------------ From 0e5303da623e186951c8ff01614f688ca09bcd16 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 11:02:01 +0000 Subject: [PATCH 132/167] =?UTF-8?q?=F0=9F=91=B7=20ci(workflow):=20add=20li?= =?UTF-8?q?nt=20job=20to=20build=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - introduce lint job in build.yml for code quality checks - ensure lint job runs before docker job - setup Node.js and install dependencies for ESLint --- .forgejo/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index cb83fb0..c15f8c5 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -6,7 +6,22 @@ on: - main jobs: + lint: + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install dependencies + run: npm ci + - name: Run ESLint + run: npm run lint + docker: + needs: lint runs-on: self-hosted steps: - name: Set up Docker Buildx From d40a577f4778669c10e644f582aa2cd0012af490 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 12:38:03 +0000 Subject: [PATCH 133/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20add=20Sonar?= =?UTF-8?q?Qube=20scan=20to=20build=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - introduce SonarQube scanning step for code quality analysis - update workflow dependencies and execution order 🐛 fix(auth): improve error handling and code formatting - remove unused imports and fix code indentation - enhance error handling with improved catch blocks 💄 style(general): standardize code formatting and style consistency - update various files to ensure consistent code style - adjust indentation and whitespace for readability --- .forgejo/workflows/build.yml | 25 ++++++++++- aliexpress.js | 30 ++++++++----- prime-gaming.js | 54 ++++++++++++----------- src/util.js | 8 ++-- steam-games.js | 10 ++--- test/sigint-enquirer-raw-keeps-running.js | 4 +- test/sigint-enquirer-raw.js | 26 +++++------ 7 files changed, 95 insertions(+), 62 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index c15f8c5..882e541 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -20,9 +20,32 @@ jobs: - name: Run ESLint run: npm run lint - docker: + sonar: needs: lint runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarQube Scan + env: + SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + docker run --rm \ + -e SONAR_HOST_URL="$SONAR_HOST_URL" \ + -e SONAR_TOKEN="$SONAR_TOKEN" \ + -v "$PWD:/usr/src" \ + -w /usr/src \ + sonarsource/sonar-scanner-cli \ + sonar-scanner \ + -Dsonar.host.url="$SONAR_HOST_URL" \ + -Dsonar.login="$SONAR_TOKEN" + + docker: + needs: [lint, sonar] + runs-on: self-hosted steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 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 dc39bba..0c982bd 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -41,7 +41,7 @@ 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(_ => {}); + 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(); @@ -61,7 +61,7 @@ try { await page.click('input[type="submit"]'); await page.fill('[name=password]', password); await page.click('input[type="submit"]'); - await handleMFA(page).catch(_ => {}); + 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; @@ -91,7 +91,7 @@ try { '[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? + 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")'); @@ -115,7 +115,7 @@ try { await context.close(); // finishes potential recording process.exit(1); }); - handleMFA(page).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.'); @@ -209,7 +209,7 @@ try { 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(() => document.scrollingElement?.scrollHeight ?? 0)); + await scrollUntilStable(() => page.evaluate(() => globalThis.document?.scrollingElement?.scrollHeight ?? 0)); const normalizeClaimUrl = url => { if (!url) return { url, key: null }; @@ -241,7 +241,7 @@ try { 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'; + const title = key || await anchorClaims.first().innerText() || 'Unknown title'; cards.push({ kind: 'external', title, url, key }); } } @@ -286,15 +286,15 @@ try { // 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); @@ -305,12 +305,12 @@ try { } 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; + 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) { @@ -353,12 +353,16 @@ try { try { await c.waitFor({ state: 'visible', timeout: 5000 }); if (!await c.isEnabled()) { - await c.evaluate(el => { el.disabled = false; el.removeAttribute('disabled'); el.click(); }); + await c.evaluate(el => { + el.disabled = false; + el.removeAttribute('disabled'); + el.click(); + }); } else { await c.click(); } return true; - } catch (_) { + } catch { // try next candidate } } @@ -375,7 +379,7 @@ try { continue; } await page.goto(url, { waitUntil: 'domcontentloaded' }); - await page.waitForSelector('[data-a-target="buy-box"]', { timeout: 10000 }).catch(_ => {}); + await page.waitForSelector('[data-a-target="buy-box"]', { timeout: 10000 }).catch(() => {}); if (cfg.debug) await page.pause(); let store = 'unknown'; const detailLoc = page.locator('[data-a-target="DescriptionItemDetails"], [data-testid="DescriptionItemDetails"]'); @@ -438,9 +442,9 @@ try { if (cfg.interactive && !await confirm()) continue; 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(_ => {}); + 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 }; 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()) { @@ -466,16 +470,16 @@ try { let code; try { // ensure CTA was clicked in case code is behind it - await clickCTA(page).catch(_ => {}); + 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 (_) { + } 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(_ => {}); + await page.screenshot({ path: screenshot('external', `${filenamify(title)}_nocode.png`), fullPage: true }).catch(() => {}); continue; } console.log(' Code to redeem game:', chalk.blue(code)); @@ -563,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'); @@ -610,7 +614,7 @@ try { // await page.pause(); } await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); - page.click('button[data-type="Game"]').catch(_ => {}); + page.click('button[data-type="Game"]').catch(() => {}); if (notify_games.length && games) { // make screenshot of all games if something was claimed and list exists const p = screenshot(`${filenamify(datetime())}.png`); @@ -628,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()); @@ -657,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()) { @@ -674,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 49424f8..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(); 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); // }); From 5b1d966c6e7569658ff9f5920a4ab383ce954905 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 12:40:06 +0000 Subject: [PATCH 134/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20enhance=20s?= =?UTF-8?q?onar=20scanner=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - extract project key from properties file for dynamic setup - add projectBaseDir to sonar scanner command for accurate analysis --- .forgejo/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 882e541..a251a62 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -33,6 +33,7 @@ jobs: SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | + PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') docker run --rm \ -e SONAR_HOST_URL="$SONAR_HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ @@ -41,7 +42,9 @@ jobs: sonarsource/sonar-scanner-cli \ sonar-scanner \ -Dsonar.host.url="$SONAR_HOST_URL" \ - -Dsonar.login="$SONAR_TOKEN" + -Dsonar.token="$SONAR_TOKEN" \ + -Dsonar.projectKey="${PROJECT_KEY:-free-games-claimer}" \ + -Dsonar.projectBaseDir=/usr/src docker: needs: [lint, sonar] From 56ca1f63d4a7894d79ad80d1736380d03ae732af Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 12:42:36 +0000 Subject: [PATCH 135/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20enhance=20s?= =?UTF-8?q?onar=20project=20key=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add SONAR_PROJECT_KEY environment variable for flexibility - fallback to default or file-based project key if not set --- .forgejo/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index a251a62..d2aa8e0 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -32,8 +32,13 @@ jobs: env: SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | - PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') + PROJECT_KEY="${SONAR_PROJECT_KEY}" + if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then + PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') + fi + PROJECT_KEY=${PROJECT_KEY:-free-games-claimer} docker run --rm \ -e SONAR_HOST_URL="$SONAR_HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ From 8626fa5a0f856c66c9cc5b16ad71ef1db80864e2 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 12:57:44 +0000 Subject: [PATCH 136/167] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(build):?= =?UTF-8?q?=20enhance=20sonar=20scanner=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - set default host url for sonar scanner to ensure consistency - add sonar.sources and sonar.scm.provider for improved analysis --- .forgejo/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index d2aa8e0..501cf33 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -34,21 +34,24 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | + HOST_URL=${SONAR_HOST_URL:-https://sonata.cyber77.de} PROJECT_KEY="${SONAR_PROJECT_KEY}" if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') fi PROJECT_KEY=${PROJECT_KEY:-free-games-claimer} docker run --rm \ - -e SONAR_HOST_URL="$SONAR_HOST_URL" \ + -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ -v "$PWD:/usr/src" \ -w /usr/src \ sonarsource/sonar-scanner-cli \ sonar-scanner \ - -Dsonar.host.url="$SONAR_HOST_URL" \ + -Dsonar.host.url="$HOST_URL" \ -Dsonar.token="$SONAR_TOKEN" \ -Dsonar.projectKey="${PROJECT_KEY:-free-games-claimer}" \ + -Dsonar.sources=. \ + -Dsonar.scm.provider=git \ -Dsonar.projectBaseDir=/usr/src docker: From e11d40bdda5f2628229ec3456ac3faad77ecc1e8 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:01:14 +0000 Subject: [PATCH 137/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20enforce=20s?= =?UTF-8?q?onar=20host=20url=20secret=20presence?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update HOST_URL to require SONAR_HOST_URL secret for enhanced security configuration - improve error handling by ensuring critical secrets are set --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 501cf33..b1cbd6d 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -34,7 +34,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | - HOST_URL=${SONAR_HOST_URL:-https://sonata.cyber77.de} + HOST_URL=${SONAR_HOST_URL:?SONAR_HOST_URL secret not set} PROJECT_KEY="${SONAR_PROJECT_KEY}" if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') From 608b6b87cdce748043cc17b36fdd1846f9a64972 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:02:52 +0000 Subject: [PATCH 138/167] =?UTF-8?q?=F0=9F=91=B7=20ci(build):=20simplify=20?= =?UTF-8?q?sonar=20project=20key=20retrieval?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove redundant conditional logic for project key extraction - enforce mandatory SONAR_PROJECT_KEY secret for consistency - change sonar.scm.provider to 'none' for improved configuration --- .forgejo/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index b1cbd6d..a2e5c5e 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -35,11 +35,7 @@ jobs: SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | HOST_URL=${SONAR_HOST_URL:?SONAR_HOST_URL secret not set} - PROJECT_KEY="${SONAR_PROJECT_KEY}" - if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then - PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') - fi - PROJECT_KEY=${PROJECT_KEY:-free-games-claimer} + PROJECT_KEY=${SONAR_PROJECT_KEY:?SONAR_PROJECT_KEY secret not set} docker run --rm \ -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ @@ -49,9 +45,9 @@ jobs: sonar-scanner \ -Dsonar.host.url="$HOST_URL" \ -Dsonar.token="$SONAR_TOKEN" \ - -Dsonar.projectKey="${PROJECT_KEY:-free-games-claimer}" \ + -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ - -Dsonar.scm.provider=git \ + -Dsonar.scm.provider=none \ -Dsonar.projectBaseDir=/usr/src docker: From 02972a04d46978da59adf6d9de6f1a9f65611d26 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:05:40 +0000 Subject: [PATCH 139/167] =?UTF-8?q?=F0=9F=90=9B=20fix(ci):=20handle=20miss?= =?UTF-8?q?ing=20sonar=20project=20key=20gracefully?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - set default empty value for PROJECT_KEY variable - add fallback to read sonar-project.properties if secret is not provided - exit with error if PROJECT_KEY is still unset after checks --- .forgejo/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index a2e5c5e..636aff9 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -35,7 +35,14 @@ jobs: SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | HOST_URL=${SONAR_HOST_URL:?SONAR_HOST_URL secret not set} - PROJECT_KEY=${SONAR_PROJECT_KEY:?SONAR_PROJECT_KEY secret not set} + PROJECT_KEY=${SONAR_PROJECT_KEY:-} + if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then + PROJECT_KEY=$(grep -E '^sonar.projectKey=' sonar-project.properties | cut -d= -f2 | tr -d '\r') + fi + if [ -z "$PROJECT_KEY" ]; then + echo "SONAR_PROJECT_KEY secret not set and no sonar-project.properties entry found" >&2 + exit 1 + fi docker run --rm \ -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ @@ -44,7 +51,6 @@ jobs: sonarsource/sonar-scanner-cli \ sonar-scanner \ -Dsonar.host.url="$HOST_URL" \ - -Dsonar.token="$SONAR_TOKEN" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ -Dsonar.scm.provider=none \ From 405660e0f2def741f7029a61f23f3081234d6f52 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:06:49 +0000 Subject: [PATCH 140/167] =?UTF-8?q?=F0=9F=90=9B=20fix(ci):=20adjust=20sona?= =?UTF-8?q?r=20scm=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - change sonar.scm.provider to sonar.scm.disabled for compatibility --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 636aff9..31abf10 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -53,7 +53,7 @@ jobs: -Dsonar.host.url="$HOST_URL" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ - -Dsonar.scm.provider=none \ + -Dsonar.scm.disabled=true \ -Dsonar.projectBaseDir=/usr/src docker: From 6c4eb948fc2a2d6976f2f318375092b59485a0fe Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:08:44 +0000 Subject: [PATCH 141/167] alles jut --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 248995e..a8fae1f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Free Games Claimer (Fork) ========================== +[![Quality Gate Status](https://sonata.cyber77.de/api/project_badges/measure?project=free-games-claimer&metric=alert_status&token=sqb_99c83edf82a1331f0c649f8a5b698b4ec8f9a965)](https://sonata.cyber77.de/dashboard?id=free-games-claimer) + Automates claiming of free games for: - Amazon Luna Gaming / Luna claims (including external stores like GOG, Epic Games, Legacy Games ) - GOG giveaways From 25fb2d983812044cd341cd3441dc827b56aed46b Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:19:36 +0000 Subject: [PATCH 142/167] chore: remove github workflows and configs --- .github/FUNDING.yml | 13 ------- .github/dependabot.yml | 28 -------------- .github/renovate.json | 7 ---- .github/workflows/docker.yml | 72 ------------------------------------ .github/workflows/lint.yml | 36 ------------------ .github/workflows/sonar.yml | 42 --------------------- 6 files changed, 198 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/dependabot.yml delete mode 100644 .github/renovate.json delete mode 100644 .github/workflows/docker.yml delete mode 100644 .github/workflows/lint.yml delete mode 100644 .github/workflows/sonar.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 9a0d965..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,13 +0,0 @@ -# These are supported funding model platforms - -github: vogler # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: fgc # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: vogler # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: vogler # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -custom: ["https://www.buymeacoffee.com/vogler", "https://paypal.me/voglerr"] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 1b47972..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,28 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "weekly" - # commit-message: - # prefix: "npm" - # include: "scope" - - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "weekly" - # commit-message: - # prefix: "docker" - # include: "scope" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - # commit-message: - # prefix: "github-actions" - # include: "scope" diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index ecfd5ff..0000000 --- a/.github/renovate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "enabled": false, - "extends": [ - "config:recommended" - ] -} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 8c12487..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Build and push Docker image (amd64, arm64 to hub.docker.com and ghcr.io) - -on: - workflow_dispatch: # allows manual trigger - push: # push on branch - branches: [main, dev] - paths: # ignore changes to .md files - - '**' - - '!*.md' - # - '!.github/**' - pull_request: # runs when opened/reopned or when the head branch is updated - -permissions: - contents: read - packages: write - -env: - BRANCH: ${{ github.head_ref || github.ref_name }} # head_ref/base_ref are only set for PRs, for branches ref_name will be used - -jobs: - docker: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set environment variables - run: | - echo "NOW=$(date -R)" >> $GITHUB_ENV # date -Iseconds; date +'%Y-%m-%dT%H:%M:%S' - if [[ "$BRANCH" == "main" ]]; then - echo "IMAGE_TAG=latest" >> $GITHUB_ENV - else - echo "IMAGE_TAG=$BRANCH" >> $GITHUB_ENV - fi - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - # if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} # does not work: Unrecognized named-value: 'secrets' - https://www.cloudtruth.com/blog/skipping-jobs-in-github-actions-when-secrets-are-unavailable-securely-inject-configuration-secrets-into-github - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} # actor is user that opened PR, was repository_owner before - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - if: ${{ env.IMAGE_TAG != '' }} - with: - context: . - push: ${{ secrets.DOCKERHUB_USERNAME != '' }} - build-args: | - COMMIT=${{ github.sha }} - BRANCH=${{ env.BRANCH }} - NOW=${{ env.NOW }} - platforms: linux/amd64,linux/arm64 - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/free-games-claimer:${{env.IMAGE_TAG}} - ghcr.io/${{ github.actor }}/free-games-claimer:${{env.IMAGE_TAG}} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 02ca3cb..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,36 +0,0 @@ -# https://github.com/marketplace/actions/super-linter#get-started -name: Lint - -on: # yamllint disable-line rule:truthy - push: null - pull_request: null - -permissions: {} - -jobs: - lint: - name: Lint - runs-on: ubuntu-latest - - permissions: - contents: read - packages: read - # To report GitHub Actions status checks - statuses: write - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - # super-linter needs the full git history to get the - # list of files that changed across commits - fetch-depth: 0 - - - name: Super-linter - uses: super-linter/super-linter/slim@v7.4.0 # x-release-please-version - # TODO need to create problem matchers for each linter? https://github.com/rhysd/actionlint/blob/v1.7.7/docs/usage.md#problem-matchers - env: - # To report GitHub Actions status checks - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # TODO automatically fix linting issues and commit them for PRs - # fix-lint-issues: # https://github.com/marketplace/actions/super-linter#github-actions-workflow-example-pull-request diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml deleted file mode 100644 index 29f81c6..0000000 --- a/.github/workflows/sonar.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Sonar - -on: - # Trigger analysis when pushing in main or pull requests, and when creating a pull request. - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened] - -permissions: - contents: read - -jobs: - sonarcloud: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v4 - with: - # Disabling shallow clone is recommended for improving relevancy of reporting. Otherwise sonarcloud will show a warning. - fetch-depth: 0 - - - uses: actions/setup-node@v4 - with: - cache: 'npm' - - - name: Install dev dependencies which includde ESLint + plugins - run: npm install --only=dev - - - name: Run ESLint - continue-on-error: true - run: npx eslint . -f json -o eslint_report.json - - - name: Fix ESLint paths - run: sed -i 's+/home/runner/work/free-games-claimer/free-games-claimer+/github/workspace+g' eslint_report.json - - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 2a4653062a9664ae836ce521a63d9efd319bda58 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:22:54 +0000 Subject: [PATCH 143/167] ci: make sonar scan pick up sources --- .forgejo/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 31abf10..f90d5ef 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -43,6 +43,11 @@ jobs: echo "SONAR_PROJECT_KEY secret not set and no sonar-project.properties entry found" >&2 exit 1 fi + echo "Sonar project key: $PROJECT_KEY" + echo "Listing workspace:" + ls -la + echo "Sample files:" + find . -maxdepth 2 -type f | head -n 20 docker run --rm \ -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ @@ -53,6 +58,7 @@ jobs: -Dsonar.host.url="$HOST_URL" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ + -Dsonar.inclusions=**/*.js \ -Dsonar.scm.disabled=true \ -Dsonar.projectBaseDir=/usr/src From 00b36a65b1a921c158357ff04a8193ac9cf36a44 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 13:25:17 +0000 Subject: [PATCH 144/167] ci: quote sonar inclusions to avoid shell glob --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index f90d5ef..e37f5bf 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -58,7 +58,7 @@ jobs: -Dsonar.host.url="$HOST_URL" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ - -Dsonar.inclusions=**/*.js \ + "-Dsonar.inclusions=**/*.js" \ -Dsonar.scm.disabled=true \ -Dsonar.projectBaseDir=/usr/src From 94be980c955b44339e0898bebce31c0c6b50accb Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:22:07 +0000 Subject: [PATCH 145/167] ci: debug sonar scanner mount and remove extra inclusions --- .forgejo/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e37f5bf..e229218 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -48,6 +48,8 @@ jobs: ls -la echo "Sample files:" find . -maxdepth 2 -type f | head -n 20 + echo "Check files inside scanner container:" + docker run --rm -v "$PWD:/usr/src" -w /usr/src alpine sh -c "ls -la /usr/src | head && find /usr/src -maxdepth 2 -type f -name '*.js' | head -n 20" docker run --rm \ -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ @@ -58,7 +60,6 @@ jobs: -Dsonar.host.url="$HOST_URL" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ - "-Dsonar.inclusions=**/*.js" \ -Dsonar.scm.disabled=true \ -Dsonar.projectBaseDir=/usr/src From b5e9111039af8d7968edd5d0d8d9d2cd476ec6d6 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:23:43 +0000 Subject: [PATCH 146/167] ci: mount workspace explicitly for sonar scanner --- .forgejo/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e229218..e7abefc 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -34,6 +34,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }} run: | + WORKDIR=${GITHUB_WORKSPACE:-$PWD} HOST_URL=${SONAR_HOST_URL:?SONAR_HOST_URL secret not set} PROJECT_KEY=${SONAR_PROJECT_KEY:-} if [ -z "$PROJECT_KEY" ] && [ -f sonar-project.properties ]; then @@ -49,19 +50,19 @@ jobs: echo "Sample files:" find . -maxdepth 2 -type f | head -n 20 echo "Check files inside scanner container:" - docker run --rm -v "$PWD:/usr/src" -w /usr/src alpine sh -c "ls -la /usr/src | head && find /usr/src -maxdepth 2 -type f -name '*.js' | head -n 20" + docker run --rm -v "$WORKDIR:/project" -w /project alpine sh -c "pwd; ls -la . | head && find . -maxdepth 2 -type f -name '*.js' | head -n 20" docker run --rm \ -e SONAR_HOST_URL="$HOST_URL" \ -e SONAR_TOKEN="$SONAR_TOKEN" \ - -v "$PWD:/usr/src" \ - -w /usr/src \ + -v "$WORKDIR:/project" \ + -w /project \ sonarsource/sonar-scanner-cli \ sonar-scanner \ -Dsonar.host.url="$HOST_URL" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ -Dsonar.scm.disabled=true \ - -Dsonar.projectBaseDir=/usr/src + -Dsonar.projectBaseDir=/project docker: needs: [lint, sonar] From f82c158a6b0b5d49046c7abfdb33572057e84ea2 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:27:12 +0000 Subject: [PATCH 147/167] ci: run sonar-scanner locally instead of docker --- .forgejo/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e7abefc..5c14708 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -28,6 +28,12 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Sonar Scanner (npm) + run: npm install -g sonarqube-scanner - name: SonarQube Scan env: SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} @@ -49,20 +55,14 @@ jobs: ls -la echo "Sample files:" find . -maxdepth 2 -type f | head -n 20 - echo "Check files inside scanner container:" - docker run --rm -v "$WORKDIR:/project" -w /project alpine sh -c "pwd; ls -la . | head && find . -maxdepth 2 -type f -name '*.js' | head -n 20" - docker run --rm \ - -e SONAR_HOST_URL="$HOST_URL" \ - -e SONAR_TOKEN="$SONAR_TOKEN" \ - -v "$WORKDIR:/project" \ - -w /project \ - sonarsource/sonar-scanner-cli \ - sonar-scanner \ - -Dsonar.host.url="$HOST_URL" \ - -Dsonar.projectKey="$PROJECT_KEY" \ - -Dsonar.sources=. \ - -Dsonar.scm.disabled=true \ - -Dsonar.projectBaseDir=/project + echo "Running local sonar-scanner..." + sonar-scanner \ + -Dsonar.host.url="$HOST_URL" \ + -Dsonar.login="$SONAR_TOKEN" \ + -Dsonar.projectKey="$PROJECT_KEY" \ + -Dsonar.sources=. \ + -Dsonar.scm.disabled=true \ + -Dsonar.projectBaseDir="$WORKDIR" docker: needs: [lint, sonar] From e4b1f60a662895d98b70a929b04e41df81dd2ed1 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:31:17 +0000 Subject: [PATCH 148/167] chore: use execFile for git commands in version check --- src/version.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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) } From 9e2bc89ff23a65a7a7b4b1d6df8683c51e46e025 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:36:41 +0000 Subject: [PATCH 149/167] chore: clean up util notify/prompt lint findings --- src/util.js | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/util.js b/src/util.js index 8ba63a3..0709e21 100644 --- a/src/util.js +++ b/src/util.js @@ -19,7 +19,9 @@ export const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); export const datetimeUTC = (d = new Date()) => d.toISOString().replace('T', ' ').replace('Z', ''); // same as datetimeUTC() but for local timezone, e.g., UTC + 2h for the above in DE export const datetime = (d = new Date()) => datetimeUTC(new Date(d.getTime() - d.getTimezoneOffset() * 60000)); -export const filenamify = s => s.replaceAll(':', '.').replace(/[^a-z0-9 _\-.]/gi, '_'); // alternative: https://www.npmjs.com/package/filenamify - On Unix-like systems, / is reserved. On Windows, <>:"/\|?* along with trailing periods are reserved. +export const filenamify = s => s + .replaceAll(':', '.') + .replaceAll(/[^a-z0-9 _\-.]/gi, '_'); // alternative: https://www.npmjs.com/package/filenamify - On Unix-like systems, / is reserved. On Windows, <>:"/\|?* along with trailing periods are reserved. export const handleSIGINT = (context = null) => process.on('SIGINT', async () => { // e.g. when killed by Ctrl-C console.error('\nInterrupted by SIGINT. Exit!'); // Exception shows where the script was:\n'); // killed before catch in docker... @@ -90,24 +92,28 @@ export const stealth = async context => { // alternative inquirer is big (node_modules 29MB, enquirer 9.7MB, prompts 9.8MB, none 9.4MB) and slower // open issue: prevents handleSIGINT() to work if prompt is cancelled with Ctrl-C instead of Escape: https://github.com/enquirer/enquirer/issues/372 import Enquirer from 'enquirer'; const enquirer = new Enquirer(); -const timeoutPlugin = timeout => enquirer => { // cancel prompt after timeout ms - enquirer.on('prompt', prompt => { +const timeoutPlugin = defaultTimeout => enquirer => { // cancel prompt after timeout ms; can be disabled per prompt via options.timeout = 0 + const onPrompt = prompt => { + const effectiveTimeout = prompt.options?.timeout ?? defaultTimeout; + if (!effectiveTimeout) return; const t = setTimeout(() => { prompt.hint = () => 'timeout'; prompt.cancel(); - }, timeout); - prompt.on('submit', () => clearTimeout(t)); - prompt.on('cancel', () => clearTimeout(t)); - }); + }, effectiveTimeout); + const clear = () => clearTimeout(t); + prompt.on('submit', clear); + prompt.on('cancel', clear); + }; + enquirer.on('prompt', onPrompt); }; -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 +enquirer.use(timeoutPlugin(cfg.login_timeout)); // 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 confirm = o => prompt({ type: 'confirm', message: 'Continue?', ...o }); // notifications via apprise CLI -import { execFile } from 'child_process'; +import { execFile } from 'node:child_process'; import { cfg } from './config.js'; export const notify = html => new Promise(resolve => { @@ -115,10 +121,9 @@ export const notify = html => new Promise(resolve => { if (cfg.debug) console.debug('notify: NOTIFY is not set!'); return resolve(); } - // const cmd = `apprise '${cfg.notify}' ${title} -i html -b '${html}'`; // this had problems if e.g. ' was used in arg; could have `npm i shell-escape`, but instead using safer execFile which takes args as array instead of exec which spawned a shell to execute the command const args = [cfg.notify, '-i', 'html', '-b', `'${html}'`]; - if (cfg.notify_title) args.push(...['-t', cfg.notify_title]); - if (cfg.debug) console.debug(`apprise ${args.map(a => `'${a}'`).join(' ')}`); // this also doesn't escape, but it's just for info + if (cfg.notify_title) args.push('-t', cfg.notify_title); + if (cfg.debug) console.debug(`apprise ${args.join(' ')}`); // this also doesn't escape, but it's just for info execFile('apprise', args, (error, stdout, stderr) => { if (error) { console.log(`error: ${error.message}`); From 69282c63d5f38b020e4de89404b381f44239fa35 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:54:14 +0000 Subject: [PATCH 150/167] Address Sonar warnings and harden runtime --- Dockerfile | 17 ++++++++++++++--- aliexpress.js | 2 +- prime-gaming.js | 4 +++- src/util.js | 5 +++-- src/version.js | 6 ++++-- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8c5e24..bd737ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,8 @@ RUN apt-get update \ /var/lib/apt/lists/* \ /var/tmp/* +RUN useradd -ms /bin/bash fgc + # RUN node --version # RUN npm --version @@ -61,10 +63,16 @@ RUN npm install # From 1.38 Playwright will no longer install browser automatically for playwright, but apparently still for playwright-firefox: https://github.com/microsoft/playwright/releases/tag/v1.38.0 # RUN npx playwright install firefox -COPY . . +# Only copy the files we actually need in the image to avoid accidentally adding secrets. +COPY *.js ./ +COPY eslint.config.js jsconfig.json sonar-project.properties ./ +COPY src ./src +COPY test ./test +COPY docker-entrypoint.sh ./ # Shell scripts need Linux line endings. On Windows, git might be configured to check out dos/CRLF line endings, so we convert them for those people in case they want to build the image. They could also use --config core.autocrlf=input RUN dos2unix ./*.sh && chmod +x ./*.sh +RUN chown -R fgc:fgc /fgc COPY docker-entrypoint.sh /usr/local/bin/ ARG COMMIT="" @@ -87,8 +95,9 @@ LABEL org.opencontainers.image.title="free-games-claimer" \ # Configure VNC via environment variables: ENV VNC_PORT 5900 ENV NOVNC_PORT 6080 -EXPOSE 5900 -EXPOSE 6080 +# Ports are not exposed by default; publish explicitly with -p when you really need GUI access. +# EXPOSE 5900 +# EXPOSE 6080 # Configure Xvfb via environment variables: ENV WIDTH 1920 @@ -98,6 +107,8 @@ ENV DEPTH 24 # Show browser instead of running headless ENV SHOW 1 +USER fgc + # Script to setup display server & VNC is always executed. ENTRYPOINT ["docker-entrypoint.sh"] # Default command to run. This is replaced by appending own command, e.g. `docker run ... node prime-gaming` to only run this script. diff --git a/aliexpress.js b/aliexpress.js index 6d654d3..f10dc46 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -40,7 +40,7 @@ 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 - await Promise.any([page.waitForURL(/.*login\.aliexpress.com.*/).then(async () => { + await Promise.any([page.waitForURL(url => url.includes('login.aliexpress.com')).then(async () => { // manual login console.error('Not logged in! Will wait for 120s for you to login...'); // await page.waitForTimeout(120*1000); diff --git a/prime-gaming.js b/prime-gaming.js index 0c982bd..00e8466 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -385,7 +385,9 @@ try { 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); + const lower = item_text.toLowerCase(); + const onPos = lower.lastIndexOf(' on '); + if (onPos >= 0) store = lower.slice(onPos + 4).replace(/[.!]$/, ''); } else if (url.includes('/claims/')) { const slug = url.split('/claims/')[1]?.split('/')[0] || ''; if (slug.includes('gog')) store = 'gog.com'; diff --git a/src/util.js b/src/util.js index 0709e21..df6a29a 100644 --- a/src/util.js +++ b/src/util.js @@ -121,10 +121,11 @@ export const notify = html => new Promise(resolve => { if (cfg.debug) console.debug('notify: NOTIFY is not set!'); return resolve(); } + const appriseBin = process.env.APPRISE_BIN || '/usr/local/bin/apprise'; const args = [cfg.notify, '-i', 'html', '-b', `'${html}'`]; if (cfg.notify_title) args.push('-t', cfg.notify_title); - if (cfg.debug) console.debug(`apprise ${args.join(' ')}`); // this also doesn't escape, but it's just for info - execFile('apprise', args, (error, stdout, stderr) => { + if (cfg.debug) console.debug(`${appriseBin} ${args.join(' ')}`); // this also doesn't escape, but it's just for info + execFile(appriseBin, args, (error, stdout, stderr) => { if (error) { console.log(`error: ${error.message}`); if (error.message.includes('command not found')) { diff --git a/src/version.js b/src/version.js index cd054d8..b5cf838 100644 --- a/src/version.js +++ b/src/version.js @@ -1,10 +1,12 @@ // check if running the latest version import { log } from 'console'; -import { execFile } from 'child_process'; +import { execFile } from 'node:child_process'; + +const gitBin = process.env.GIT_BIN || '/usr/bin/git'; const runGit = (...args) => new Promise((resolve, reject) => { - execFile('git', args, { cwd: process.cwd() }, (error, stdout, stderr) => { + execFile(gitBin, args, { cwd: process.cwd() }, (error, stdout, stderr) => { if (stderr) console.error(`stderr: ${stderr}`); // if (stdout) console.log(`stdout: ${stdout}`); if (error) { From 37ffd0954526b204735a150f637d7d2732c94f88 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 14:56:50 +0000 Subject: [PATCH 151/167] Refactor prompt timeout plugin to reduce nesting --- src/util.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/util.js b/src/util.js index df6a29a..dab047f 100644 --- a/src/util.js +++ b/src/util.js @@ -92,19 +92,22 @@ export const stealth = async context => { // alternative inquirer is big (node_modules 29MB, enquirer 9.7MB, prompts 9.8MB, none 9.4MB) and slower // open issue: prevents handleSIGINT() to work if prompt is cancelled with Ctrl-C instead of Escape: https://github.com/enquirer/enquirer/issues/372 import Enquirer from 'enquirer'; const enquirer = new Enquirer(); -const timeoutPlugin = defaultTimeout => enquirer => { // cancel prompt after timeout ms; can be disabled per prompt via options.timeout = 0 - const onPrompt = prompt => { - const effectiveTimeout = prompt.options?.timeout ?? defaultTimeout; - if (!effectiveTimeout) return; - const t = setTimeout(() => { - prompt.hint = () => 'timeout'; - prompt.cancel(); - }, effectiveTimeout); - const clear = () => clearTimeout(t); - prompt.on('submit', clear); - prompt.on('cancel', clear); - }; - enquirer.on('prompt', onPrompt); +const timeoutHint = () => 'timeout'; +const cancelPromptWithHint = prompt => { + prompt.hint = timeoutHint; + prompt.cancel(); +}; +const applyPromptTimeout = (prompt, timeout) => { + if (!timeout) return; + const timer = setTimeout(cancelPromptWithHint, timeout, prompt); + const clearTimer = () => clearTimeout(timer); + prompt.on('submit', clearTimer); + prompt.on('cancel', clearTimer); +}; +// cancel prompt after timeout ms; can be disabled per prompt via options.timeout = 0 +const timeoutPlugin = defaultTimeout => enquirerInstance => { + const onPrompt = prompt => applyPromptTimeout(prompt, prompt.options?.timeout ?? defaultTimeout); + enquirerInstance.on('prompt', onPrompt); }; enquirer.use(timeoutPlugin(cfg.login_timeout)); // single prompt that just returns the non-empty value instead of an object From 405e80185140928bdecf2eb477876a7595cf8a5a Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 15:39:11 +0000 Subject: [PATCH 152/167] Clean Sonar findings: merge RUNs, drop commented code, update node imports --- Dockerfile | 10 ++++---- aliexpress.js | 17 -------------- epic-games.js | 4 ++-- src/migrate.js | 2 +- src/version.js | 18 ++------------- test/notify.js | 61 ++++++++++++++++++++++++++----------------------- unrealengine.js | 4 ++-- 7 files changed, 44 insertions(+), 72 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd737ae..d5f53da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,13 +45,12 @@ RUN apt-get update \ /var/lib/apt/lists/* \ /var/tmp/* -RUN useradd -ms /bin/bash fgc - # RUN node --version # RUN npm --version -RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html -RUN pip install apprise +RUN useradd -ms /bin/bash fgc \ + && ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \ + && pip install apprise WORKDIR /fgc COPY package*.json ./ @@ -71,8 +70,7 @@ COPY test ./test COPY docker-entrypoint.sh ./ # Shell scripts need Linux line endings. On Windows, git might be configured to check out dos/CRLF line endings, so we convert them for those people in case they want to build the image. They could also use --config core.autocrlf=input -RUN dos2unix ./*.sh && chmod +x ./*.sh -RUN chown -R fgc:fgc /fgc +RUN dos2unix ./*.sh && chmod +x ./*.sh && chown -R fgc:fgc /fgc COPY docker-entrypoint.sh /usr/local/bin/ ARG COMMIT="" diff --git a/aliexpress.js b/aliexpress.js index f10dc46..a28cf8a 100644 --- a/aliexpress.js +++ b/aliexpress.js @@ -14,7 +14,6 @@ const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({ const context = await firefox.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, - // viewport: { width: cfg.width, height: cfg.height }, locale: 'en-US', // ignore OS locale to be sure to have english text for locators -> done via /en in URL recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/aliexpress-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools @@ -29,7 +28,6 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, { }, }); handleSIGINT(context); -// await stealth(context); await new FingerprintInjector().attachFingerprintToPlaywright(context, { fingerprint, headers }); context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout); @@ -41,10 +39,7 @@ const auth = async 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 await Promise.any([page.waitForURL(url => url.includes('login.aliexpress.com')).then(async () => { - // manual login 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 const login = page.locator('.login-container'); const email = cfg.ae_email || await prompt({ message: 'Enter email' }); @@ -60,12 +55,8 @@ const auth = async url => { const error = login.locator('.error-text'); 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(() => {}); - - // await page.locator('#nav-user-account').hover(); - // console.log('Logged in as:', await page.locator('.welcome-name').innerText()); }; // copied URLs from AliExpress app on tablet which has menu for the used webview @@ -82,7 +73,6 @@ const urls = { /* eslint-disable no-unused-vars */ const coins = async () => { - // await auth(urls.coins); await Promise.any([page.locator('.checkin-button').click(), page.locator('.addcoin').waitFor()]); console.log('Coins:', await page.locator('.mycoin-content-right-money').innerText()); console.log('Streak:', await page.locator('.title-box').innerText()); @@ -107,20 +97,13 @@ const merge = async () => { /* eslint-enable no-unused-vars */ try { - // await coins(); await [ - // coins, - // grow, - // gogo, - // euro, merge, ].reduce((a, f) => a.then(async () => { await auth(urls[f.name]); await f(); console.log(); }), Promise.resolve()); - - // await page.pause(); } catch (error) { process.exitCode ||= 1; console.error('--- Exception:'); diff --git a/epic-games.js b/epic-games.js index 4db1e75..b12b35a 100644 --- a/epic-games.js +++ b/epic-games.js @@ -1,8 +1,8 @@ import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra import { authenticator } from 'otplib'; import chalk from 'chalk'; -import path from 'path'; -import { existsSync, writeFileSync, appendFileSync } from 'fs'; +import path from 'node:path'; +import { existsSync, writeFileSync, appendFileSync } from 'node:fs'; import { resolve, jsonDb, datetime, stealth, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; diff --git a/src/migrate.js b/src/migrate.js index b2db945..80abc9d 100644 --- a/src/migrate.js +++ b/src/migrate.js @@ -1,4 +1,4 @@ -import { existsSync } from 'fs'; +import { existsSync } from 'node:fs'; import { Low } from 'lowdb'; import { JSONFile } from 'lowdb/node'; import { datetime } from './util.js'; diff --git a/src/version.js b/src/version.js index b5cf838..5f61351 100644 --- a/src/version.js +++ b/src/version.js @@ -1,6 +1,4 @@ -// check if running the latest version - -import { log } from 'console'; +import { log } from 'node:console'; import { execFile } from 'node:child_process'; const gitBin = process.env.GIT_BIN || '/usr/bin/git'; @@ -20,10 +18,7 @@ const runGit = (...args) => new Promise((resolve, reject) => { }); }); -// const git_main = () => readFileSync('.git/refs/heads/main').toString().trim(); - let sha, date; -// if (existsSync('/.dockerenv')) { // did not work if (process.env.NOVNC_PORT) { log('Running inside Docker.'); ['COMMIT', 'BRANCH', 'NOW'].forEach(v => log(` ${v}:`, process.env[v])); @@ -33,22 +28,13 @@ if (process.env.NOVNC_PORT) { log('Not running inside Docker.'); 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) } -const gh = await (await fetch('https://api.github.com/repos/vogler/free-games-claimer/commits/main', { - // headers: { accept: 'application/vnd.github.VERSION.sha' } -})).json(); -// log(gh); +const gh = await (await fetch('https://api.github.com/repos/vogler/free-games-claimer/commits/main')).json(); log('Local commit:', sha, new Date(date)); log('Online commit:', gh.sha, new Date(gh.commit.committer.date)); -// git describe --all --long --dirty -// --> heads/main-0-gdee47d2-dirty -// git describe --tags --long --dirty -// --> v1.7-35-gdee47d2-dirty - if (sha == gh.sha) { log('Running the latest version!'); } else { diff --git a/test/notify.js b/test/notify.js index 6d89086..b97994d 100644 --- a/test/notify.js +++ b/test/notify.js @@ -6,33 +6,38 @@ const URL_CLAIM = 'https://gaming.amazon.com/home'; // dummy URL console.debug('NOTIFY:', cfg.notify); -if (true) { - const notify_games = [ - // { title: 'Kerbal Space Program', status: 'claimed', url: URL_CLAIM }, - // { title: "Shadow Tactics - Aiko's Choice", status: 'claimed', url: URL_CLAIM }, - { title: 'Epistory - Typing Chronicles', status: 'claimed', url: URL_CLAIM }, - ]; - await notify(`epic-games:
${html_game_list(notify_games)}`); -} +const scenarios = [ + { + enabled: process.env.TEST_NOTIFY_EPIC === '1', + title: 'epic-games', + games: [ + { title: 'Epistory - Typing Chronicles', status: 'claimed', url: URL_CLAIM }, + ], + }, + { + enabled: process.env.TEST_NOTIFY_PG === '1', + delayMs: 1000, + title: 'prime-gaming', + games: [ + { title: 'Faraway 2: Jungle Escape', status: 'claimed', url: URL_CLAIM }, + { title: 'Chicken Police - Paint it RED!', status: 'claimed', url: URL_CLAIM }, + { title: 'Lawn Mowing Simulator', status: 'claimed', url: URL_CLAIM }, + { title: 'Breathedge', status: 'claimed', url: URL_CLAIM }, + { title: 'The Evil Within 2', status: `redeem H97S6FB38FA6D09DEA on gog.com`, url: URL_CLAIM }, + { title: 'Beat Cop', status: `redeem BMKM8558EC55F7B38F on gog.com`, url: URL_CLAIM }, + { title: 'Dishonored 2', status: `redeem NNEK0987AB20DFBF8F on gog.com`, url: URL_CLAIM }, + ], + }, + { + enabled: process.env.TEST_NOTIFY_GOG === '1', + delayMs: 1000, + title: 'gog', + games: [{ title: 'Haven Park', status: 'claimed', url: URL_CLAIM }], + }, +]; -if (false) { - await delay(1000); - const notify_games = [ - { title: 'Faraway 2: Jungle Escape', status: 'claimed', url: URL_CLAIM }, - { title: 'Chicken Police - Paint it RED!', status: 'claimed', url: URL_CLAIM }, - { title: 'Lawn Mowing Simulator', status: 'claimed', url: URL_CLAIM }, - { title: 'Breathedge', status: 'claimed', url: URL_CLAIM }, - { title: 'The Evil Within 2', status: `redeem H97S6FB38FA6D09DEA on gog.com`, url: URL_CLAIM }, - { title: 'Beat Cop', status: `redeem BMKM8558EC55F7B38F on gog.com`, url: URL_CLAIM }, - { title: 'Dishonored 2', status: `redeem NNEK0987AB20DFBF8F on gog.com`, url: URL_CLAIM }, - ]; - notify(`prime-gaming:
${html_game_list(notify_games)}`); -} - -if (false) { - await delay(1000); - const notify_games = [ - { title: 'Haven Park', status: 'claimed', url: URL_CLAIM }, - ]; - notify(`gog:
${html_game_list(notify_games)}`); +for (const scenario of scenarios) { + if (!scenario.enabled) continue; + if (scenario.delayMs) await delay(scenario.delayMs); + await notify(`${scenario.title}:
${html_game_list(scenario.games)}`); } diff --git a/unrealengine.js b/unrealengine.js index 2bb8ee9..4f4de4b 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -3,8 +3,8 @@ import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra import { authenticator } from 'otplib'; -import path from 'path'; -import { writeFileSync } from 'fs'; +import path from 'node:path'; +import { writeFileSync } from 'node:fs'; import { resolve, jsonDb, datetime, stealth, filenamify, prompt, notify, html_game_list, handleSIGINT } from './src/util.js'; import { cfg } from './src/config.js'; From 397871b0122cb3e7817523e61d4365ac8893a29f Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 15:47:28 +0000 Subject: [PATCH 153/167] Further clean Sonar: merge base RUN, strip comments, node imports --- Dockerfile | 10 ++-------- gog.js | 5 ----- src/version.js | 1 - steam-games.js | 3 --- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5f53da..a3dcbc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get update \ novnc websockify \ dos2unix \ python3-pip \ - # && npx playwright install-deps firefox \ - && apt-get install --no-install-recommends -y \ libgtk-3-0 \ libasound2 \ libxcomposite1 \ @@ -43,12 +41,8 @@ RUN apt-get update \ /usr/share/doc/* \ /var/cache/* \ /var/lib/apt/lists/* \ - /var/tmp/* - -# RUN node --version -# RUN npm --version - -RUN useradd -ms /bin/bash fgc \ + /var/tmp/* \ + && useradd -ms /bin/bash fgc \ && ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \ && pip install apprise diff --git a/gog.js b/gog.js index 6269fc2..67da726 100644 --- a/gog.js +++ b/gog.js @@ -32,7 +32,6 @@ if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it -// console.debug('userAgent:', await page.evaluate(() => navigator.userAgent)); const notify_games = []; let user; @@ -42,7 +41,6 @@ try { await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); // default 'load' takes forever - // page.click('#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll').catch(_ => { }); // does not work reliably, solved by setting CookieConsent above const signIn = page.locator('a:has-text("Sign in")').first(); await Promise.any([signIn.waitFor(), page.waitForSelector('#menuUsername')]); while (await signIn.isVisible()) { @@ -71,12 +69,9 @@ try { await iframe.locator('#second_step_authentication_send').click(); await page.waitForTimeout(1000); // TODO still needed with wait for username below? }).catch(_ => { }); - // iframe.locator('iframe[title=reCAPTCHA]').waitFor().then(() => { - // iframe.locator('.g-recaptcha').waitFor().then(() => { iframe.locator('text=Invalid captcha').waitFor().then(() => { console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); notify('gog: got captcha during login. Please check.'); - // TODO solve reCAPTCHA? }).catch(_ => { }); await page.waitForSelector('#menuUsername'); } else { diff --git a/src/version.js b/src/version.js index 5f61351..f838d8f 100644 --- a/src/version.js +++ b/src/version.js @@ -6,7 +6,6 @@ const gitBin = process.env.GIT_BIN || '/usr/bin/git'; const runGit = (...args) => new Promise((resolve, reject) => { execFile(gitBin, 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.code === 'ENOENT' || error.message.includes('command not found')) { diff --git a/steam-games.js b/steam-games.js index ed54253..b23fd31 100644 --- a/steam-games.js +++ b/steam-games.js @@ -18,7 +18,6 @@ const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({ const context = await firefox.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, - // viewport: { width: cfg.width, height: cfg.height }, 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: { @@ -29,7 +28,6 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, { 'accept-language': headers['accept-language'], }, }); -// await stealth(context); await new FingerprintInjector().attachFingerprintToPlaywright(context, { fingerprint, headers }); context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout); @@ -61,7 +59,6 @@ try { db.data[title] = stat; } - // await page.pause(); } catch (error) { process.exitCode ||= 1; console.error('--- Exception:'); From 5f919039ab00328c2e02a51f1972b11a42591692 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:08:59 +0000 Subject: [PATCH 154/167] Clean Sonar issues in store scripts --- epic-games.js | 151 ++++++++++++++++++------------------ gog.js | 39 +++++----- prime-gaming.js | 69 ++++++++-------- src/migrate.js | 1 - test/sigint-enquirer-raw.js | 25 +----- unrealengine.js | 74 +++++++++--------- 6 files changed, 172 insertions(+), 187 deletions(-) diff --git a/epic-games.js b/epic-games.js index b12b35a..8253881 100644 --- a/epic-games.js +++ b/epic-games.js @@ -29,17 +29,13 @@ if (existsSync(browserPrefs)) { const context = await firefox.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0', // see replace of Headless in util.newStealthContext. TODO Windows UA enough to avoid 'device not supported'? update if browser is updated? - // userAgent firefox (macOS): Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:106.0) Gecko/20100101 Firefox/106.0 - // userAgent firefox (docker): Mozilla/5.0 (X11; Linux aarch64; rv:109.0) Gecko/20100101 Firefox/115.0 + userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0', // Windows UA avoids "device not supported"; update when browser version changes locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/eg-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved // user settings for firefox have to be put in $BROWSER_DIR/user.js - args: [ // https://wiki.mozilla.org/Firefox/CommandLineOptions - // '-kiosk', - ], + args: [], // https://wiki.mozilla.org/Firefox/CommandLineOptions }); handleSIGINT(context); @@ -50,7 +46,7 @@ await stealth(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist -await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it +await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it // some debug info about the page (screen dimensions, user agent, platform) // eslint-disable-next-line no-undef @@ -76,8 +72,6 @@ try { if (cfg.time) console.timeEnd('startup'); if (cfg.time) console.time('login'); - // page.click('button:has-text("Accept All Cookies")').catch(_ => { }); // Not needed anymore since we set the cookie above. Clicking this did not always work since the message was animated in too slowly. - while (await page.locator('egs-navigation').getAttribute('isloggedin') != 'true') { console.error('Not signed in anymore. Please login in the browser or here in the terminal.'); if (cfg.novnc_port) console.info(`Open http://localhost:${cfg.novnc_port} to login inside the docker container.`); @@ -98,16 +92,20 @@ try { const email = cfg.eg_email || await prompt({ message: 'Enter email' }); if (!email) await notifyBrowserLogin(); else { - // await page.click('text=Sign in with Epic Games'); - page.waitForSelector('.h_captcha_challenge iframe').then(async () => { - console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); - await notify('epic-games: got captcha during login. Please check.'); - }).catch(_ => { }); - page.waitForSelector('p:has-text("Incorrect response.")').then(async () => { - console.error('Incorrect response for captcha!'); - }).catch(_ => { }); + void (async () => { + try { + await page.waitForSelector('.h_captcha_challenge iframe', { timeout: 15000 }); + console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); + await notify('epic-games: got captcha during login. Please check.'); + } catch {} + })(); + void (async () => { + try { + await page.waitForSelector('p:has-text("Incorrect response.")', { timeout: 15000 }); + console.error('Incorrect response for captcha!'); + } catch {} + })(); await page.fill('#email', email); - // await page.click('button[type="submit"]'); login was split in two steps for some time, now email and password are on the same form again const password = email && (cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' })); if (!password) await notifyBrowserLogin(); else { @@ -115,18 +113,22 @@ try { await page.click('button[type="submit"]'); } const error = page.locator('#form-error-message'); - error.waitFor().then(async () => { - console.error('Login error:', await error.innerText()); - console.log('Please login in the browser!'); - }).catch(_ => { }); - // handle MFA, but don't await it - page.waitForURL('**/id/login/mfa**').then(async () => { - console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); - // TODO locator for text (email or app?) - const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); - await page.click('button[type="submit"]'); - }).catch(_ => { }); + void (async () => { + try { + await error.waitFor({ timeout: 15000 }); + console.error('Login error:', await error.innerText()); + console.log('Please login in the browser!'); + } catch {} + })(); + void (async () => { + try { + await page.waitForURL('**/id/login/mfa**', { timeout: cfg.login_timeout }); + console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); + const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); + await page.click('button[type="submit"]'); + } catch {} + })(); } await page.waitForURL(URL_CLAIM); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); @@ -141,7 +143,7 @@ try { const game_loc = page.locator('a:has(span:text-is("Free Now"))'); await game_loc.last().waitFor().catch(_ => { // rarely there are no free games available -> catch Timeout - // TODO would be better to wait for alternative like 'coming soon' instead of waiting for timeout + // waiting for timeout; alternative would be waiting for "coming soon" // see https://github.com/vogler/free-games-claimer/issues/210#issuecomment-1727420943 console.error('Seems like currently there are no free games available in your region...'); // urls below should then be an empty list @@ -208,36 +210,31 @@ try { console.log(' Requires base game! Nothing to claim.'); notify_game.status = 'requires base game'; db.data[user][game_id].status ||= 'failed:requires-base-game'; - // TODO claim base game if it is free + // if base game is free, add to queue as well const baseUrl = 'https://store.epicgames.com' + await page.locator('a:has-text("Overview")').getAttribute('href'); console.log(' Base game:', baseUrl); // await page.click('a:has-text("Overview")'); - // TODO handle this via function call for base game above since this will never terminate if DRYRUN=1 + // re-add original add-on to queue after base game urls.push(baseUrl); // add base game to the list of games to claim urls.push(url); // add add-on itself again } else { // GET console.log(' Not in library yet! Click', btnText); await purchaseBtn.click({ delay: 11 }); // got stuck here without delay (or mouse move), see #75, 1ms was also enough - // click Continue if 'Device not supported. This product is not compatible with your current device.' - avoided by Windows userAgent? - page.click('button:has-text("Continue")').catch(_ => { }); // needed since change from Chromium to Firefox? - - // click 'Yes, buy now' if 'This edition contains something you already have. Still interested?' - page.click('button:has-text("Yes, buy now")').catch(_ => { }); - // Accept End User License Agreement (only needed once) - page.locator(':has-text("end user license agreement")').waitFor().then(async () => { - console.log(' Accept End User License Agreement (only needed once)'); - console.log(page.innerHTML); - console.log('Please report the HTML above here: https://github.com/vogler/free-games-claimer/issues/371'); - await page.locator('input#agree').check(); // TODO Bundle: got stuck here; likely unrelated to bundle and locator just changed: https://github.com/vogler/free-games-claimer/issues/371 - await page.locator('button:has-text("Accept")').click(); - }).catch(_ => { }); + void (async () => { + try { + await page.locator(':has-text("end user license agreement")').waitFor({ timeout: 10000 }); + console.log(' Accept End User License Agreement (only needed once)'); + await page.locator('input#agree').check(); + await page.locator('button:has-text("Accept")').click(); + } catch {} + })(); // it then creates an iframe for the purchase - await page.waitForSelector('#webPurchaseContainer iframe'); // TODO needed? + await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); - // skip game if unavailable in region, https://github.com/vogler/free-games-claimer/issues/46 TODO check games for account's region + // skip game if unavailable in region, https://github.com/vogler/free-games-claimer/issues/46 if (await iframe.locator(':has-text("unavailable in your region")').count() > 0) { console.error(' This product is unavailable in your region!'); db.data[user][game_id].status = notify_game.status = 'unavailable-in-region'; @@ -245,14 +242,17 @@ try { continue; } - iframe.locator('.payment-pin-code').waitFor().then(async () => { - if (!cfg.eg_parentalpin) { - console.error(' EG_PARENTALPIN not set. Need to enter Parental Control PIN manually.'); - notify('epic-games: EG_PARENTALPIN not set. Need to enter Parental Control PIN manually.'); - } - await iframe.locator('input.payment-pin-code__input').first().pressSequentially(cfg.eg_parentalpin); - await iframe.locator('button:has-text("Continue")').click({ delay: 11 }); - }).catch(_ => { }); + void (async () => { + try { + await iframe.locator('.payment-pin-code').waitFor({ timeout: 10000 }); + if (!cfg.eg_parentalpin) { + console.error(' EG_PARENTALPIN not set. Need to enter Parental Control PIN manually.'); + notify('epic-games: EG_PARENTALPIN not set. Need to enter Parental Control PIN manually.'); + } + await iframe.locator('input.payment-pin-code__input').first().pressSequentially(cfg.eg_parentalpin); + await iframe.locator('button:has-text("Continue")').click({ delay: 11 }); + } catch {} + })(); if (cfg.debug) await page.pause(); if (cfg.dryrun) { @@ -267,27 +267,30 @@ try { // 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 Accept")'); - btnAgree.waitFor().then(() => btnAgree.click()).catch(_ => { }); // EU: wait for and click 'I Agree' + void (async () => { + try { + await btnAgree.waitFor({ timeout: 10000 }); + await btnAgree.click(); + } catch {} + })(); // EU: wait for and click 'I Agree' try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? const captcha = iframe.locator('#h_captcha_challenge_checkout_free_prod iframe'); - captcha.waitFor().then(async () => { // don't await, since element may not be shown - // console.info(' Got hcaptcha challenge! NopeCHA extension will likely solve it.') - console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); - // await notify(`epic-games: got captcha challenge right before claim of ${title}. Use VNC to solve it manually.`); // TODO not all apprise services understand HTML: https://github.com/vogler/free-games-claimer/pull/417 - await notify(`epic-games: got captcha challenge for.\nGame link: ${url}`); - // TODO could even create purchase URL, see https://github.com/vogler/free-games-claimer/pull/130 - // await page.waitForTimeout(2000); - // const p = path.resolve(cfg.dir.screenshots, 'epic-games', 'captcha', `${filenamify(datetime())}.png`); - // await captcha.screenshot({ path: p }); - // console.info(' Saved a screenshot of hcaptcha challenge to', p); - // console.error(' Got hcaptcha challenge. To avoid it, get a link from https://www.hcaptcha.com/accessibility'); // TODO save this link in config and visit it daily to set accessibility cookie to avoid captcha challenge? - }).catch(_ => { }); // may time out if not shown - iframe.locator('.payment__errors:has-text("Failed to challenge captcha, please try again later.")').waitFor().then(async () => { - console.error(' Failed to challenge captcha, please try again later.'); - await notify('epic-games: failed to challenge captcha. Please check.'); - }).catch(_ => { }); - await page.locator('text=Thanks for your order!').waitFor({ state: 'attached' }); // TODO Bundle: got stuck here, but normal game now as well + void (async () => { + try { + await captcha.waitFor({ timeout: 10000 }); + console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); + await notify(`epic-games: got captcha challenge for.\nGame link: ${url}`); + } catch {} + })(); // may time out if not shown + void (async () => { + try { + await iframe.locator('.payment__errors:has-text("Failed to challenge captcha, please try again later.")').waitFor({ timeout: 10000 }); + console.error(' Failed to challenge captcha, please try again later.'); + await notify('epic-games: failed to challenge captcha. Please check.'); + } catch {} + })(); + await page.locator('text=Thanks for your order!').waitFor({ state: 'attached' }); db.data[user][game_id].status = 'claimed'; db.data[user][game_id].time = datetime(); // claimed time overwrites failed/dryrun time console.log(' Claimed successfully!'); diff --git a/gog.js b/gog.js index 67da726..9b8b2b8 100644 --- a/gog.js +++ b/gog.js @@ -31,7 +31,7 @@ handleSIGINT(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist -await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it +await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it const notify_games = []; let user; @@ -47,7 +47,7 @@ try { console.error('Not signed in anymore.'); await signIn.click(); // it then creates an iframe for the login - await page.waitForSelector('#GalaxyAccountsFrameContainer iframe'); // TODO needed? + await page.waitForSelector('#GalaxyAccountsFrameContainer iframe'); const iframe = page.frameLocator('#GalaxyAccountsFrameContainer iframe'); if (!cfg.debug) context.setDefaultTimeout(cfg.login_timeout); // give user some extra time to log in console.info(`Login timeout is ${cfg.login_timeout / 1000} seconds!`); @@ -60,19 +60,24 @@ try { await iframe.locator('#login_username').fill(email); await iframe.locator('#login_password').fill(password); await iframe.locator('#login_login').click(); - // handle MFA, but don't await it - iframe.locator('form[name=second_step_authentication]').waitFor().then(async () => { - console.log('Two-Step Verification - Enter security code'); - console.log(await iframe.locator('.form__description').innerText()); - const otp = await prompt({ type: 'text', message: 'Enter two-factor sign in code', validate: n => n.toString().length == 4 || 'The code must be 4 digits!' }); // can't use type: 'number' since it strips away leading zeros and codes sometimes have them - await iframe.locator('#second_step_authentication_token_letter_1').pressSequentially(otp.toString(), { delay: 10 }); - await iframe.locator('#second_step_authentication_send').click(); - await page.waitForTimeout(1000); // TODO still needed with wait for username below? - }).catch(_ => { }); - iframe.locator('text=Invalid captcha').waitFor().then(() => { - console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); - notify('gog: got captcha during login. Please check.'); - }).catch(_ => { }); + void (async () => { + try { + await iframe.locator('form[name=second_step_authentication]').waitFor({ timeout: 15000 }); + console.log('Two-Step Verification - Enter security code'); + console.log(await iframe.locator('.form__description').innerText()); + const otp = await prompt({ type: 'text', message: 'Enter two-factor sign in code', validate: n => n.toString().length == 4 || 'The code must be 4 digits!' }); // can't use type: 'number' since it strips away leading zeros and codes sometimes have them + await iframe.locator('#second_step_authentication_token_letter_1').pressSequentially(otp.toString(), { delay: 10 }); + await iframe.locator('#second_step_authentication_send').click(); + await page.waitForTimeout(1000); + } catch {} + })(); + void (async () => { + try { + await iframe.locator('text=Invalid captcha').waitFor({ timeout: 15000 }); + console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); + notify('gog: got captcha during login. Please check.'); + } catch {} + })(); await page.waitForSelector('#menuUsername'); } else { console.log('Waiting for you to login in the browser.'); @@ -101,11 +106,9 @@ try { console.log(`Current free game: ${chalk.blue(title)} - ${url}`); db.data[user][title] ||= { title, time: datetime(), url }; if (cfg.dryrun) process.exit(1); - // await page.locator('#giveaway:not(.is-loading)').waitFor(); // otherwise screenshot is sometimes with loading indicator instead of game title; #TODO fix, skipped due to timeout, see #240 await banner.screenshot({ path: screenshot(`${filenamify(title)}.png`) }); // overwrites every time - only keep first? - // await banner.getByRole('button', { name: 'Add to library' }).click(); - // instead of clicking the button, we visit the auto-claim URL which gives as a JSON response which is easier than checking the state of a button + // instead of clicking the button, visit the auto-claim URL which gives a JSON response await page.goto('https://www.gog.com/giveaway/claim'); const response = await page.innerText('body'); // console.log(response); diff --git a/prime-gaming.js b/prime-gaming.js index 00e8466..c881f79 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -6,7 +6,6 @@ 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://luna.amazon.com/claims/home'; console.log(datetime(), 'started checking prime-gaming'); @@ -25,14 +24,12 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, { handleSIGINT(context); -// TODO test if needed await stealth(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist -await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it -// console.debug('userAgent:', await page.evaluate(() => navigator.userAgent)); +await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it const notify_games = []; let user; @@ -62,14 +59,18 @@ try { 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 + try { + await page.waitForURL('**/ap/signin**'); 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); - }); + if (error.trim().length) { + console.error('Login error:', error); + await notify(`prime-gaming: login: ${error}`); + await context.close(); // finishes potential recording + process.exit(1); + } + } catch { + // if navigation succeeded, continue + } await page.waitForURL(/luna\.amazon\.com\/claims\/.*signedIn=true/); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); return true; @@ -91,7 +92,7 @@ try { '[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? + page.click('[aria-label="Cookies usage disclaimer banner"] button:has-text("Accept Cookies")').catch(() => { }); // to not waste screen space when non-headless; could be flaky 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")'); @@ -105,16 +106,19 @@ try { await page.fill('[name=email]', email); await page.click('input[type="submit"]'); await page.fill('[name=password]', password); - // await page.check('[name=rememberMe]'); // no longer exists await page.click('input[type="submit"]'); - page.waitForURL('**/ap/signin**').then(async () => { // check for wrong credentials + try { + await page.waitForURL('**/ap/signin**'); 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); - }); + if (error.trim().length) { + console.error('Login error:', error); + await notify(`prime-gaming: login: ${error}`); + await context.close(); // finishes potential recording + process.exit(1); + } + } catch { + // navigation ok + } handleMFA(page).catch(() => {}); } else { console.log('Waiting for you to login in the browser.'); @@ -130,9 +134,6 @@ try { } 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(); - // console.log(`Twitch user name is ${twitch}`); db.data[user] ||= {}; if (await page.getByRole('button', { name: 'Try Prime' }).count()) { @@ -156,7 +157,7 @@ try { // loading all games became flaky; see https://github.com/vogler/free-games-claimer/issues/357 await page.keyboard.press('PageDown'); // scrolling to straight to the bottom started to skip loading some games await page.waitForLoadState('networkidle'); // wait for all games to be loaded - await page.waitForTimeout(3000); // TODO networkidle wasn't enough to load all already collected games + await page.waitForTimeout(3000); // extra wait to load all already collected games // do it again since once wasn't enough... await page.keyboard.press('PageDown'); await page.waitForTimeout(3000); @@ -372,9 +373,9 @@ try { 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.`); + const existingStatus = db.data[user]?.[title]?.status; + if (existingStatus && !existingStatus.startsWith('failed')) { + console.log(` Already recorded as ${existingStatus}, skipping.`); notify_games.push({ title, url, status: 'existed' }); continue; } @@ -448,21 +449,21 @@ try { page.waitForSelector('div:has-text("Link game account")', { timeout: cfg.timeout }).catch(() => {}), ]).catch(() => {}); db.data[user][title] ||= { title, time: datetime(), url, store }; - 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. + if (await page.locator('div:has-text("Link game account")').count() // epic games store also shows "Link account" || await page.locator('div:has-text("Link account")').count()) { console.error(' Account linking is required to claim this offer!'); notify_game.status = `failed: need account linking for ${store}`; db.data[user][title].status = 'failed: need account linking'; // await page.pause(); // await page.click('[data-a-target="LinkAccountModal"] [data-a-target="LinkAccountButton"]'); - // TODO login for epic games also needed if already logged in + // login for epic games also needed if already logged in // wait for https://www.epicgames.com/id/authorize?redirect_uri=https%3A%2F%2Fservice.link.amazon.gg... // await page.click('button[aria-label="Allow"]'); } else { db.data[user][title].status = 'claimed'; // print code if there is one const redeem = { - // 'origin': 'https://www.origin.com/redeem', // TODO still needed or now only via account linking? + // 'origin': 'https://www.origin.com/redeem', // kept for legacy flows; current path uses account linking 'gog.com': 'https://www.gog.com/redeem', 'microsoft store': 'https://account.microsoft.com/billing/redeem', xbox: 'https://account.microsoft.com/billing/redeem', @@ -519,7 +520,7 @@ try { } else if (reason == 'code_not_found') { redeem_action = 'redeem (not found)'; console.error(' Code was not found!'); - } else { // TODO not logged in? need valid unused code to test. + } else { // unknown state; keep info log for later analysis redeem_action = 'redeemed?'; // console.log(' Redeemed successfully? Please report your Responses (if new) in https://github.com/vogler/free-games-claimer/issues/5'); console.debug(` Response 1: ${r1t}`); @@ -569,12 +570,12 @@ try { if (j?.events?.cart.length && j.events.cart[0]?.data?.reason == 'UserAlreadyOwnsContent') { redeem_action = 'already redeemed'; console.error(' error: UserAlreadyOwnsContent'); - } else { // TODO what's returned on success? + } else { // success path not seen yet; log below if needed 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'); } - } else { // TODO find out other responses + } else { // other responses; keep info log for analysis redeem_action = 'unknown'; console.debug(` Response: ${rt}`); console.log(' Redeemed successfully? Please report your Response from above (if it is new) in https://github.com/vogler/free-games-claimer/issues/5'); @@ -672,7 +673,7 @@ try { const match = unlinked_store.match(/Link (.*) account/); if (match && match.length == 2) unlinked_store = match[1]; } else if (await page.locator('text=Link game account').count()) { // epic-games only? - console.error(' Missing account linking (epic-games specific button?):', await page.locator('button[data-a-target="gms-cta"]').innerText()); // TODO needed? + console.error(' Missing account linking (epic-games specific button?):', await page.locator('button[data-a-target="gms-cta"]').innerText()); // track account-linking UI drift unlinked_store = 'epic-games'; } if (unlinked_store) { diff --git a/src/migrate.js b/src/migrate.js index 80abc9d..e28e88d 100644 --- a/src/migrate.js +++ b/src/migrate.js @@ -18,7 +18,6 @@ const datetime_UTCtoLocalTimezone = async file => { db.data[user][game].time = time2; } } - // console.log(db.data); await db.write(); // write out json db }; diff --git a/test/sigint-enquirer-raw.js b/test/sigint-enquirer-raw.js index c85ee0d..baf1e1c 100644 --- a/test/sigint-enquirer-raw.js +++ b/test/sigint-enquirer-raw.js @@ -1,36 +1,13 @@ // https://github.com/enquirer/enquirer/issues/372 import { prompt, handleSIGINT } from '../src/util.js'; -// const handleSIGINT = () => process.on('SIGINT', () => { // e.g. when killed by Ctrl-C -// console.log('\nInterrupted by SIGINT. Exit!'); -// process.exitCode = 130; -// }); 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); -// } -// }); -// } -// onRawSIGINT(() => { -// console.log('raw'); process.exit(1); -// }); - console.log('hello'); console.error('hello error'); try { - let i = 'foo'; + let i = await prompt(); // SIGINT no longer handled if this is executed i = await prompt(); // SIGINT no longer handled if this is executed - i = await prompt(); // SIGINT no longer handled if this is executed - // handleSIGINT(); console.log('value:', i); setTimeout(() => console.log('timeout 3s'), 3000); } catch (e) { diff --git a/unrealengine.js b/unrealengine.js index 4f4de4b..8fe84b8 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -1,6 +1,3 @@ -// TODO This is mostly a copy of epic-games.js -// New assets to claim every first Tuesday of a month. - import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra import { authenticator } from 'otplib'; import path from 'node:path'; @@ -21,8 +18,7 @@ const db = await jsonDb('unrealengine.json', {}); const context = await firefox.launchPersistentContext(cfg.dir.browser, { headless: cfg.headless, viewport: { width: cfg.width, height: cfg.height }, - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.83 Safari/537.36', // see replace of Headless in util.newStealthContext. TODO Windows UA enough to avoid 'device not supported'? update if browser is updated? - // userAgent for firefox: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:106.0) Gecko/20100101 Firefox/106.0 + userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.83 Safari/537.36', // Windows UA avoids "device not supported"; update when browser version changes locale: 'en-US', // ignore OS locale to be sure to have english text for locators recordVideo: cfg.record ? { dir: 'data/record/', size: { width: cfg.width, height: cfg.height } } : undefined, // will record a .webm video for each page navigated; without size, video would be scaled down to fit 800x800 recordHar: cfg.record ? { path: `data/record/ue-${filenamify(datetime())}.har` } : undefined, // will record a HAR file with network requests and responses; can be imported in Chrome devtools @@ -36,8 +32,7 @@ await stealth(context); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist -await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it -// console.debug('userAgent:', await page.evaluate(() => navigator.userAgent)); +await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it const notify_games = []; let user; @@ -60,23 +55,26 @@ try { const email = cfg.eg_email || await prompt({ message: 'Enter email' }); const password = email && (cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' })); if (email && password) { - // await page.click('text=Sign in with Epic Games'); await page.fill('#email', email); await page.click('button[type="submit"]'); await page.fill('#password', password); await page.click('button[type="submit"]'); - page.waitForSelector('#h_captcha_challenge_login_prod iframe').then(() => { - console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); - notify('unrealengine: got captcha during login. Please check.'); - }).catch(_ => { }); - // handle MFA, but don't await it - page.waitForURL('**/id/login/mfa**').then(async () => { - console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); - // TODO locator for text (email or app?) - const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); - await page.click('button[type="submit"]'); - }).catch(_ => { }); + void (async () => { + try { + await page.waitForSelector('#h_captcha_challenge_login_prod iframe', { timeout: 15000 }); + console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); + notify('unrealengine: got captcha during login. Please check.'); + } catch {} + })(); + void (async () => { + try { + await page.waitForURL('**/id/login/mfa**', { timeout: cfg.login_timeout }); + console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); + const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); + await page.click('button[type="submit"]'); + } catch {} + })(); } else { console.log('Waiting for you to login in the browser.'); await notify('unrealengine: no longer signed in and not enough options set for automatic login.'); @@ -135,18 +133,19 @@ try { notify('unrealengine: ' + err); process.exit(1); } - // await page.pause(); console.log('Click shopping cart'); await page.locator('.shopping-cart').click(); - // await page.waitForTimeout(2000); await page.locator('button.checkout').click(); console.log('Click checkout'); // maybe: Accept End User License Agreement - page.locator('[name=accept-label]').check().then(() => { - console.log('Accept End User License Agreement'); - page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' - }).catch(_ => { }); - await page.waitForSelector('#webPurchaseContainer iframe'); // TODO needed? + void (async () => { + try { + await page.locator('[name=accept-label]').check({ timeout: 10000 }); + console.log('Accept End User License Agreement'); + await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' + } catch {} + })(); + await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); if (cfg.debug) await page.pause(); @@ -161,14 +160,21 @@ try { // 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")'); - btnAgree.waitFor().then(() => btnAgree.click()).catch(_ => { }); // EU: wait for and click 'I Agree' + void (async () => { + try { + await btnAgree.waitFor({ timeout: 10000 }); + await btnAgree.click(); + } catch {} + })(); // EU: wait for and click 'I Agree' try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? const captcha = iframe.locator('#h_captcha_challenge_checkout_free_prod iframe'); - captcha.waitFor().then(async () => { // don't await, since element may not be shown - // console.info(' Got hcaptcha challenge! NopeCHA extension will likely solve it.') - console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); - }).catch(_ => { }); // may time out if not shown + void (async () => { + try { + await captcha.waitFor({ timeout: 10000 }); + console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); + } catch {} + })(); // may time out if not shown await page.waitForSelector('text=Thank you'); for (const id of ids) { db.data[user][id].status = 'claimed'; @@ -176,16 +182,12 @@ try { } notify_games.forEach(g => g.status == 'failed' && (g.status = 'claimed')); console.log('Claimed successfully!'); - // context.setDefaultTimeout(cfg.timeout); } catch (e) { console.log(e); - // console.error(' Failed to claim! Try again if NopeCHA timed out. Click the extension to see if you ran out of credits (refill after 24h). To avoid captchas try to get a new IP or set a cookie from https://www.hcaptcha.com/accessibility'); console.error(' Failed to claim! To avoid captchas try to get a new IP address.'); await page.screenshot({ path: screenshot('failed', `${filenamify(datetime())}.png`), fullPage: true }); - // db.data[user][id].status = 'failed'; notify_games.forEach(g => g.status = 'failed'); } - // notify_game.status = db.data[user][game_id].status; // claimed or failed if (notify_games.length) await page.screenshot({ path: screenshot(`${filenamify(datetime())}.png`), fullPage: false }); // fullPage is quite long... console.log('Done'); From 3fd861f134011233e3ef820e82e1defcf4d83467 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:13:15 +0000 Subject: [PATCH 155/167] Fix eslint no-empty and clean tests --- epic-games.js | 36 +++++++++++++++++++++++++++--------- gog.js | 8 ++++++-- test/notify.js | 1 - unrealengine.js | 20 +++++++++++++++----- 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/epic-games.js b/epic-games.js index 8253881..22a9113 100644 --- a/epic-games.js +++ b/epic-games.js @@ -97,13 +97,17 @@ try { await page.waitForSelector('.h_captcha_challenge iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); await notify('epic-games: got captcha during login. Please check.'); - } catch {} + } catch (e) { + return; + } })(); void (async () => { try { await page.waitForSelector('p:has-text("Incorrect response.")', { timeout: 15000 }); console.error('Incorrect response for captcha!'); - } catch {} + } catch (e) { + return; + } })(); await page.fill('#email', email); const password = email && (cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' })); @@ -118,7 +122,9 @@ try { await error.waitFor({ timeout: 15000 }); console.error('Login error:', await error.innerText()); console.log('Please login in the browser!'); - } catch {} + } catch (e) { + return; + } })(); void (async () => { try { @@ -127,7 +133,9 @@ try { const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); await page.click('button[type="submit"]'); - } catch {} + } catch (e) { + return; + } })(); } await page.waitForURL(URL_CLAIM); @@ -228,7 +236,9 @@ try { console.log(' Accept End User License Agreement (only needed once)'); await page.locator('input#agree').check(); await page.locator('button:has-text("Accept")').click(); - } catch {} + } catch (e) { + return; + } })(); // it then creates an iframe for the purchase @@ -251,7 +261,9 @@ try { } await iframe.locator('input.payment-pin-code__input').first().pressSequentially(cfg.eg_parentalpin); await iframe.locator('button:has-text("Continue")').click({ delay: 11 }); - } catch {} + } catch (e) { + return; + } })(); if (cfg.debug) await page.pause(); @@ -271,7 +283,9 @@ try { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); - } catch {} + } catch (e) { + return; + } })(); // EU: wait for and click 'I Agree' try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? @@ -281,14 +295,18 @@ try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); await notify(`epic-games: got captcha challenge for.\nGame link: ${url}`); - } catch {} + } catch (e) { + return; + } })(); // may time out if not shown void (async () => { try { await iframe.locator('.payment__errors:has-text("Failed to challenge captcha, please try again later.")').waitFor({ timeout: 10000 }); console.error(' Failed to challenge captcha, please try again later.'); await notify('epic-games: failed to challenge captcha. Please check.'); - } catch {} + } catch (e) { + return; + } })(); await page.locator('text=Thanks for your order!').waitFor({ state: 'attached' }); db.data[user][game_id].status = 'claimed'; diff --git a/gog.js b/gog.js index 9b8b2b8..2f83d6b 100644 --- a/gog.js +++ b/gog.js @@ -69,14 +69,18 @@ try { await iframe.locator('#second_step_authentication_token_letter_1').pressSequentially(otp.toString(), { delay: 10 }); await iframe.locator('#second_step_authentication_send').click(); await page.waitForTimeout(1000); - } catch {} + } catch (e) { + return; + } })(); void (async () => { try { await iframe.locator('text=Invalid captcha').waitFor({ timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); notify('gog: got captcha during login. Please check.'); - } catch {} + } catch (e) { + return; + } })(); await page.waitForSelector('#menuUsername'); } else { diff --git a/test/notify.js b/test/notify.js index b97994d..c5709a9 100644 --- a/test/notify.js +++ b/test/notify.js @@ -1,4 +1,3 @@ -/* eslint-disable no-constant-condition */ import { delay, html_game_list, notify } from '../src/util.js'; import { cfg } from '../src/config.js'; diff --git a/unrealengine.js b/unrealengine.js index 8fe84b8..fe93460 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -64,7 +64,9 @@ try { await page.waitForSelector('#h_captcha_challenge_login_prod iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); notify('unrealengine: got captcha during login. Please check.'); - } catch {} + } catch (e) { + return; + } })(); void (async () => { try { @@ -73,7 +75,9 @@ try { const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); await page.click('button[type="submit"]'); - } catch {} + } catch (e) { + return; + } })(); } else { console.log('Waiting for you to login in the browser.'); @@ -143,7 +147,9 @@ try { await page.locator('[name=accept-label]').check({ timeout: 10000 }); console.log('Accept End User License Agreement'); await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' - } catch {} + } catch (e) { + return; + } })(); await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); @@ -164,7 +170,9 @@ try { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); - } catch {} + } catch (e) { + return; + } })(); // EU: wait for and click 'I Agree' try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? @@ -173,7 +181,9 @@ try { try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); - } catch {} + } catch (e) { + return; + } })(); // may time out if not shown await page.waitForSelector('text=Thank you'); for (const id of ids) { From 52895fd991e2fdb826778f4405fa57a765ce08ef Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:15:14 +0000 Subject: [PATCH 156/167] Fix eslint no-unused-vars in async handlers --- epic-games.js | 18 +++++++++--------- gog.js | 4 ++-- unrealengine.js | 26 +++++++++++++------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/epic-games.js b/epic-games.js index 22a9113..bbf000c 100644 --- a/epic-games.js +++ b/epic-games.js @@ -97,7 +97,7 @@ try { await page.waitForSelector('.h_captcha_challenge iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); await notify('epic-games: got captcha during login. Please check.'); - } catch (e) { + } catch { return; } })(); @@ -105,7 +105,7 @@ try { try { await page.waitForSelector('p:has-text("Incorrect response.")', { timeout: 15000 }); console.error('Incorrect response for captcha!'); - } catch (e) { + } catch { return; } })(); @@ -122,7 +122,7 @@ try { await error.waitFor({ timeout: 15000 }); console.error('Login error:', await error.innerText()); console.log('Please login in the browser!'); - } catch (e) { + } catch { return; } })(); @@ -133,7 +133,7 @@ try { const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); await page.click('button[type="submit"]'); - } catch (e) { + } catch { return; } })(); @@ -236,7 +236,7 @@ try { console.log(' Accept End User License Agreement (only needed once)'); await page.locator('input#agree').check(); await page.locator('button:has-text("Accept")').click(); - } catch (e) { + } catch { return; } })(); @@ -261,7 +261,7 @@ try { } await iframe.locator('input.payment-pin-code__input').first().pressSequentially(cfg.eg_parentalpin); await iframe.locator('button:has-text("Continue")').click({ delay: 11 }); - } catch (e) { + } catch { return; } })(); @@ -283,7 +283,7 @@ try { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); - } catch (e) { + } catch { return; } })(); // EU: wait for and click 'I Agree' @@ -295,7 +295,7 @@ try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); await notify(`epic-games: got captcha challenge for.\nGame link: ${url}`); - } catch (e) { + } catch { return; } })(); // may time out if not shown @@ -304,7 +304,7 @@ try { await iframe.locator('.payment__errors:has-text("Failed to challenge captcha, please try again later.")').waitFor({ timeout: 10000 }); console.error(' Failed to challenge captcha, please try again later.'); await notify('epic-games: failed to challenge captcha. Please check.'); - } catch (e) { + } catch { return; } })(); diff --git a/gog.js b/gog.js index 2f83d6b..5f0abad 100644 --- a/gog.js +++ b/gog.js @@ -69,7 +69,7 @@ try { await iframe.locator('#second_step_authentication_token_letter_1').pressSequentially(otp.toString(), { delay: 10 }); await iframe.locator('#second_step_authentication_send').click(); await page.waitForTimeout(1000); - } catch (e) { + } catch { return; } })(); @@ -78,7 +78,7 @@ try { await iframe.locator('text=Invalid captcha').waitFor({ timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); notify('gog: got captcha during login. Please check.'); - } catch (e) { + } catch { return; } })(); diff --git a/unrealengine.js b/unrealengine.js index fe93460..ad6ed68 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -64,7 +64,7 @@ try { await page.waitForSelector('#h_captcha_challenge_login_prod iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); notify('unrealengine: got captcha during login. Please check.'); - } catch (e) { + } catch { return; } })(); @@ -75,7 +75,7 @@ try { const otp = cfg.eg_otpkey && authenticator.generate(cfg.eg_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="code-input-0"]').pressSequentially(otp.toString()); await page.click('button[type="submit"]'); - } catch (e) { + } catch { return; } })(); @@ -142,15 +142,15 @@ try { await page.locator('button.checkout').click(); console.log('Click checkout'); // maybe: Accept End User License Agreement - void (async () => { - try { - await page.locator('[name=accept-label]').check({ timeout: 10000 }); - console.log('Accept End User License Agreement'); - await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' - } catch (e) { - return; - } - })(); + void (async () => { + try { + await page.locator('[name=accept-label]').check({ timeout: 10000 }); + console.log('Accept End User License Agreement'); + await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' + } catch { + return; + } + })(); await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); @@ -170,7 +170,7 @@ try { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); - } catch (e) { + } catch { return; } })(); // EU: wait for and click 'I Agree' @@ -181,7 +181,7 @@ try { try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); - } catch (e) { + } catch { return; } })(); // may time out if not shown From bab4359977fa5efeeea33c5e9da07363cab538de Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:16:29 +0000 Subject: [PATCH 157/167] Fix indentation in unrealengine eslint --- unrealengine.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/unrealengine.js b/unrealengine.js index ad6ed68..1098a28 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -142,15 +142,15 @@ try { await page.locator('button.checkout').click(); console.log('Click checkout'); // maybe: Accept End User License Agreement - void (async () => { - try { - await page.locator('[name=accept-label]').check({ timeout: 10000 }); - console.log('Accept End User License Agreement'); - await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' - } catch { - return; - } - })(); + void (async () => { + try { + await page.locator('[name=accept-label]').check({ timeout: 10000 }); + console.log('Accept End User License Agreement'); + await page.locator('span:text-is("Accept")').click(); // otherwise matches 'Accept All Cookies' + } catch { + return; + } + })(); await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); From b9aa6e007305395432bd08c53f970c1cd36eddd9 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:19:53 +0000 Subject: [PATCH 158/167] Use sonar.token instead of deprecated sonar.login --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 5c14708..f42dbff 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -58,7 +58,7 @@ jobs: echo "Running local sonar-scanner..." sonar-scanner \ -Dsonar.host.url="$HOST_URL" \ - -Dsonar.login="$SONAR_TOKEN" \ + -Dsonar.token="$SONAR_TOKEN" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ -Dsonar.scm.disabled=true \ From 7ffc454e479dbcd7a8d03fb6ebe00c19a19f073c Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:45:17 +0000 Subject: [PATCH 159/167] Clean up Sonar issues and lint warnings --- epic-games.js | 75 ++++++++++++++++++------------- eslint.config.js | 2 +- gog.js | 13 +++--- prime-gaming.js | 90 +++++++++++++++++++++---------------- test/sigint-enquirer-raw.js | 6 +-- unrealengine.js | 27 ++++++----- 6 files changed, 124 insertions(+), 89 deletions(-) diff --git a/epic-games.js b/epic-games.js index bbf000c..d7eb80d 100644 --- a/epic-games.js +++ b/epic-games.js @@ -48,9 +48,18 @@ if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaround for https://github.com/vogler/free-games-claimer/issues/277 until Playwright fixes it -// some debug info about the page (screen dimensions, user agent, platform) -// eslint-disable-next-line no-undef -if (cfg.debug) console.debug(await page.evaluate(() => [(({ width, height, availWidth, availHeight }) => ({ width, height, availWidth, availHeight }))(window.screen), navigator.userAgent, navigator.platform, navigator.vendor])); // deconstruct screen needed since `window.screen` prints {}, `window.screen.toString()` '[object Screen]', and can't use some pick function without defining it on `page` +// some debug info about the page (screen dimensions, user agent) +if (cfg.debug) { + // eslint-disable-next-line no-undef + const debugInfo = await page.evaluate(() => { + const { width, height, availWidth, availHeight } = window.screen; + return { + screen: { width, height, availWidth, availHeight }, + userAgent: navigator.userAgent, + }; + }); + console.debug(debugInfo); +} if (cfg.debug_network) { // const filter = _ => true; const filter = r => r.url().includes('store.epicgames.com'); @@ -90,9 +99,8 @@ try { } }; const email = cfg.eg_email || await prompt({ message: 'Enter email' }); - if (!email) await notifyBrowserLogin(); - else { - void (async () => { + if (email) { + const watchCaptchaChallenge = async () => { try { await page.waitForSelector('.h_captcha_challenge iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); @@ -100,24 +108,25 @@ try { } catch { return; } - })(); - void (async () => { + }; + const watchCaptchaIncorrect = async () => { try { await page.waitForSelector('p:has-text("Incorrect response.")', { timeout: 15000 }); console.error('Incorrect response for captcha!'); } catch { return; } - })(); + }; + watchCaptchaChallenge(); + watchCaptchaIncorrect(); await page.fill('#email', email); - const password = email && (cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' })); - if (!password) await notifyBrowserLogin(); - else { + const password = cfg.eg_password || await prompt({ type: 'password', message: 'Enter password' }); + if (password) { await page.fill('#password', password); await page.click('button[type="submit"]'); - } + } else await notifyBrowserLogin(); const error = page.locator('#form-error-message'); - void (async () => { + const watchLoginError = async () => { try { await error.waitFor({ timeout: 15000 }); console.error('Login error:', await error.innerText()); @@ -125,8 +134,8 @@ try { } catch { return; } - })(); - void (async () => { + }; + const watchMfaStep = async () => { try { await page.waitForURL('**/id/login/mfa**', { timeout: cfg.login_timeout }); console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); @@ -136,8 +145,10 @@ try { } catch { return; } - })(); - } + }; + watchLoginError(); + watchMfaStep(); + } else await notifyBrowserLogin(); await page.waitForURL(URL_CLAIM); if (!cfg.debug) context.setDefaultTimeout(cfg.timeout); } @@ -223,14 +234,13 @@ try { console.log(' Base game:', baseUrl); // await page.click('a:has-text("Overview")'); // re-add original add-on to queue after base game - urls.push(baseUrl); // add base game to the list of games to claim - urls.push(url); // add add-on itself again + urls.push(baseUrl, url); // add base game to the list of games to claim and re-add add-on itself } else { // GET console.log(' Not in library yet! Click', btnText); await purchaseBtn.click({ delay: 11 }); // got stuck here without delay (or mouse move), see #75, 1ms was also enough // Accept End User License Agreement (only needed once) - void (async () => { + const acceptEulaIfShown = async () => { try { await page.locator(':has-text("end user license agreement")').waitFor({ timeout: 10000 }); console.log(' Accept End User License Agreement (only needed once)'); @@ -239,7 +249,8 @@ try { } catch { return; } - })(); + }; + acceptEulaIfShown(); // it then creates an iframe for the purchase await page.waitForSelector('#webPurchaseContainer iframe'); @@ -252,7 +263,7 @@ try { continue; } - void (async () => { + const enterParentalPinIfNeeded = async () => { try { await iframe.locator('.payment-pin-code').waitFor({ timeout: 10000 }); if (!cfg.eg_parentalpin) { @@ -264,7 +275,8 @@ try { } catch { return; } - })(); + }; + enterParentalPinIfNeeded(); if (cfg.debug) await page.pause(); if (cfg.dryrun) { @@ -279,18 +291,19 @@ try { // 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 Accept")'); - void (async () => { + const acceptIfRequired = async () => { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); } catch { return; } - })(); // EU: wait for and click 'I Agree' + }; // EU: wait for and click 'I Agree' + acceptIfRequired(); try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? const captcha = iframe.locator('#h_captcha_challenge_checkout_free_prod iframe'); - void (async () => { + const watchCaptchaChallenge = async () => { try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); @@ -298,8 +311,8 @@ try { } catch { return; } - })(); // may time out if not shown - void (async () => { + }; // may time out if not shown + const watchCaptchaFailure = async () => { try { await iframe.locator('.payment__errors:has-text("Failed to challenge captcha, please try again later.")').waitFor({ timeout: 10000 }); console.error(' Failed to challenge captcha, please try again later.'); @@ -307,7 +320,9 @@ try { } catch { return; } - })(); + }; + watchCaptchaChallenge(); + watchCaptchaFailure(); await page.locator('text=Thanks for your order!').waitFor({ state: 'attached' }); db.data[user][game_id].status = 'claimed'; db.data[user][game_id].time = datetime(); // claimed time overwrites failed/dryrun time diff --git a/eslint.config.js b/eslint.config.js index 48b1cbc..3c99bf5 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -11,7 +11,7 @@ export default [ { ignores: ['data/**'], }, - js.configs.recommended, // TODO still needed? + js.configs.recommended, { // files: ['*.js'], languageOptions: { diff --git a/gog.js b/gog.js index 5f0abad..767fec1 100644 --- a/gog.js +++ b/gog.js @@ -60,7 +60,7 @@ try { await iframe.locator('#login_username').fill(email); await iframe.locator('#login_password').fill(password); await iframe.locator('#login_login').click(); - void (async () => { + const handleTwoFactor = async () => { try { await iframe.locator('form[name=second_step_authentication]').waitFor({ timeout: 15000 }); console.log('Two-Step Verification - Enter security code'); @@ -72,8 +72,8 @@ try { } catch { return; } - })(); - void (async () => { + }; + const watchInvalidCaptcha = async () => { try { await iframe.locator('text=Invalid captcha').waitFor({ timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); @@ -81,7 +81,9 @@ try { } catch { return; } - })(); + }; + handleTwoFactor(); + watchInvalidCaptcha(); await page.waitForSelector('#menuUsername'); } else { console.log('Waiting for you to login in the browser.'); @@ -100,7 +102,8 @@ try { db.data[user] ||= {}; const banner = page.locator('#giveaway'); - if (!await banner.count()) { + const hasGiveaway = await banner.count(); + if (!hasGiveaway) { console.log('Currently no free giveaway!'); } else { const text = await page.locator('.giveaway__content-header').innerText(); diff --git a/prime-gaming.js b/prime-gaming.js index c881f79..47d7c70 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -92,7 +92,11 @@ try { '[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; could be flaky + try { + await page.click('[aria-label="Cookies usage disclaimer banner"] button:has-text("Accept Cookies")'); // to not waste screen space when non-headless; could be flaky + } catch { + // ignore if banner not present + } 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")'); @@ -119,7 +123,11 @@ try { } catch { // navigation ok } - handleMFA(page).catch(() => {}); + try { + await handleMFA(page); + } catch { + // ignore MFA watcher errors + } } 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.'); @@ -297,7 +305,6 @@ try { return [p, isNew]; }; const skipBasedOnTime = async url => { - // console.log(' Checking time left for game:', url); const [p, isNew] = await sameOrNewPage(url); const dueDateLoc = p.locator('.availability-date .tw-bold, [data-testid="availability-end-date"], [data-test-selector="availability-end-date"]'); if (!await dueDateLoc.count()) { @@ -321,7 +328,10 @@ try { console.log('Current free game:', chalk.blue(title)); if (cfg.pg_timeLeft && url && await skipBasedOnTime(url)) continue; if (cfg.dryrun) continue; - if (cfg.interactive && !await confirm()) continue; + if (cfg.interactive) { + const confirmed = await confirm(); + if (!confirmed) continue; + } 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 }); @@ -336,8 +346,6 @@ try { 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(), @@ -353,14 +361,14 @@ try { if (await c.count()) { try { await c.waitFor({ state: 'visible', timeout: 5000 }); - if (!await c.isEnabled()) { + const enabled = await c.isEnabled(); + if (enabled) await c.click(); + else { await c.evaluate(el => { el.disabled = false; el.removeAttribute('disabled'); el.click(); }); - } else { - await c.click(); } return true; } catch { @@ -442,7 +450,10 @@ try { } if (cfg.pg_timeLeft && await skipBasedOnTime(url)) continue; if (cfg.dryrun) continue; - if (cfg.interactive && !await confirm()) continue; + if (cfg.interactive) { + const confirmed = await confirm(); + if (!confirmed) continue; + } await clickCTA(page); await Promise.any([ page.waitForSelector('.thank-you-title:has-text("Success")', { timeout: cfg.timeout }).catch(() => {}), @@ -499,13 +510,9 @@ try { const page2 = await context.newPage(); await page2.goto(redeem[store], { waitUntil: 'domcontentloaded' }); if (store == 'gog.com') { - // await page.goto(`https://redeem.gog.com/v1/bonusCodes/${code}`); // {"reason":"Invalid or no captcha"} await page2.fill('#codeInput', code); - // wait for responses before clicking on Continue and then Redeem - // first there are requests with OPTIONS and GET to https://redeem.gog.com/v1/bonusCodes/XYZ?language=de-DE const r1 = page2.waitForResponse(r => r.request().method() == 'GET' && r.url().startsWith('https://redeem.gog.com/')); await page2.click('[type="submit"]'); // click Continue - // console.log(await page2.locator('.warning-message').innerText()); // does not exist if there is no warning const r1t = await (await r1).text(); const reason = JSON.parse(r1t).reason; // {"reason":"Invalid or no captcha"} @@ -520,14 +527,12 @@ try { } else if (reason == 'code_not_found') { redeem_action = 'redeem (not found)'; console.error(' Code was not found!'); - } else { // unknown state; keep info log for later analysis - redeem_action = 'redeemed?'; - // console.log(' Redeemed successfully? Please report your Responses (if new) in https://github.com/vogler/free-games-claimer/issues/5'); - console.debug(` Response 1: ${r1t}`); - // then after the click on Redeem there is a POST request which should return {} if claimed successfully - const r2 = page2.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://redeem.gog.com/')); - await page2.click('[type="submit"]'); // click Redeem - const r2t = await (await r2).text(); + } else { // unknown state; keep info log for later analysis + redeem_action = 'redeemed?'; + console.debug(` Response 1: ${r1t}`); + const r2 = page2.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://redeem.gog.com/')); + await page2.click('[type="submit"]'); // click Redeem + const r2t = await (await r2).text(); const reason2 = JSON.parse(r2t).reason; if (r2t == '{}') { redeem_action = 'redeemed'; @@ -543,7 +548,6 @@ try { } } else if (store == 'microsoft store' || store == 'xbox') { console.error(` Redeem on ${store} is experimental!`); - // await page2.pause(); if (page2.url().startsWith('https://login.')) { console.error(' Not logged in! Please redeem the code above manually. You can now login in the browser for next time. Waiting for 60s.'); await page2.waitForTimeout(60 * 1000); @@ -554,9 +558,7 @@ try { await input.waitFor(); await input.fill(code); const r = page2.waitForResponse(r => r.url().startsWith('https://cart.production.store-web.dynamics.com/v1.0/Redeem/PrepareRedeem')); - // console.log(await page2.locator('.redeem_code_error').innerText()); const rt = await (await r).text(); - // {"code":"NotFound","data":[],"details":[],"innererror":{"code":"TokenNotFound",... const j = JSON.parse(rt); const reason = j?.events?.cart.length && j.events.cart[0]?.data?.reason; if (reason == 'TokenNotFound') { @@ -582,14 +584,12 @@ try { } } } else if (store == 'legacy games') { - // await page2.pause(); await page2.fill('[name=coupon_code]', code); await page2.fill('[name=email]', cfg.lg_email); await page2.fill('[name=email_validate]', cfg.lg_email); await page2.uncheck('[name=newsletter_sub]'); await page2.click('[type="submit"]'); try { - // await page2.waitForResponse(r => r.url().startsWith('https://promo.legacygames.com/promotion-processing/order-management.php')); // status code 302 await page2.waitForSelector('h2:has-text("Thanks for redeeming")'); redeem_action = 'redeemed'; db.data[user][title].status = 'claimed and redeemed'; @@ -609,15 +609,16 @@ try { } else { notify_game.status = `claimed on ${store}`; db.data[user][title].status = 'claimed'; - } - // save screenshot of potential code just in case - await page.screenshot({ path: screenshot('external', `${filenamify(title)}.png`), fullPage: true }); - // console.info(' Saved a screenshot of page to', p); } - // await page.pause(); + await page.screenshot({ path: screenshot('external', `${filenamify(title)}.png`), fullPage: true }); + } } await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); - page.click('button[data-type="Game"]').catch(() => {}); + try { + await page.click('button[data-type="Game"]'); + } catch { + // ignore if filter already selected + } if (notify_games.length && games) { // make screenshot of all games if something was claimed and list exists const p = screenshot(`${filenamify(datetime())}.png`); @@ -663,15 +664,28 @@ try { await page.goto(url, { waitUntil: 'domcontentloaded' }); // 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(() => { }); + const claimOptions = [ + page.click('.tw-button:has-text("Get in-game content")'), + page.click('.tw-button:has-text("Claim your gift")'), + (async () => { + await page.click('.tw-button:has-text("Claim")'); + await page.click('button:has-text("Continue")').catch(() => {}); + })(), + ]; + await Promise.any(claimOptions); + try { + await page.click('button:has-text("Continue")'); + } catch { + // continue button not always present + } const linkAccountButton = page.locator('[data-a-target="LinkAccountButton"]'); let unlinked_store; if (await linkAccountButton.count()) { unlinked_store = await linkAccountButton.first().getAttribute('aria-label'); console.debug(' LinkAccountButton label:', unlinked_store); - const match = unlinked_store.match(/Link (.*) account/); - if (match && match.length == 2) unlinked_store = match[1]; + const match = unlinked_store?.match(/Link (.*) account/); + const extracted = match?.[1]; + if (extracted) unlinked_store = extracted; } else if (await page.locator('text=Link game account').count()) { // epic-games only? console.error(' Missing account linking (epic-games specific button?):', await page.locator('button[data-a-target="gms-cta"]').innerText()); // track account-linking UI drift unlinked_store = 'epic-games'; @@ -685,9 +699,7 @@ try { console.log(' Code to redeem game:', chalk.blue(code)); db.data[user][title].code = code; db.data[user][title].status = 'claimed'; - // notify_game.status = `${redeem_action} ${code} on ${store}`; } - // await page.pause(); } catch (error) { console.error(error); } finally { diff --git a/test/sigint-enquirer-raw.js b/test/sigint-enquirer-raw.js index baf1e1c..f9f365c 100644 --- a/test/sigint-enquirer-raw.js +++ b/test/sigint-enquirer-raw.js @@ -6,9 +6,9 @@ handleSIGINT(); console.log('hello'); console.error('hello error'); try { - let i = await prompt(); // SIGINT no longer handled if this is executed - i = await prompt(); // SIGINT no longer handled if this is executed - console.log('value:', i); + const first = await prompt(); // SIGINT no longer handled if this is executed + const second = await prompt(); // SIGINT no longer handled if this is executed + console.log('values:', first, second); setTimeout(() => console.log('timeout 3s'), 3000); } catch (e) { process.exitCode ||= 1; diff --git a/unrealengine.js b/unrealengine.js index 1098a28..6eb7d79 100644 --- a/unrealengine.js +++ b/unrealengine.js @@ -59,7 +59,7 @@ try { await page.click('button[type="submit"]'); await page.fill('#password', password); await page.click('button[type="submit"]'); - void (async () => { + const watchCaptchaDuringLogin = async () => { try { await page.waitForSelector('#h_captcha_challenge_login_prod iframe', { timeout: 15000 }); console.error('Got a captcha during login (likely due to too many attempts)! You may solve it in the browser, get a new IP or try again in a few hours.'); @@ -67,8 +67,8 @@ try { } catch { return; } - })(); - void (async () => { + }; + const watchMfa = async () => { try { await page.waitForURL('**/id/login/mfa**', { timeout: cfg.login_timeout }); console.log('Enter the security code to continue - This appears to be a new device, browser or location. A security code has been sent to your email address at ...'); @@ -78,7 +78,9 @@ try { } catch { return; } - })(); + }; + watchCaptchaDuringLogin(); + watchMfa(); } else { console.log('Waiting for you to login in the browser.'); await notify('unrealengine: no longer signed in and not enough options set for automatic login.'); @@ -125,7 +127,7 @@ try { } ids.push(id); } - if (!ids.length) { + if (ids.length === 0) { console.log('Nothing to claim'); } else { await page.waitForTimeout(2000); @@ -142,7 +144,7 @@ try { await page.locator('button.checkout').click(); console.log('Click checkout'); // maybe: Accept End User License Agreement - void (async () => { + const acceptEulaIfPresent = async () => { try { await page.locator('[name=accept-label]').check({ timeout: 10000 }); console.log('Accept End User License Agreement'); @@ -150,7 +152,8 @@ try { } catch { return; } - })(); + }; + acceptEulaIfPresent(); await page.waitForSelector('#webPurchaseContainer iframe'); const iframe = page.frameLocator('#webPurchaseContainer iframe'); @@ -166,25 +169,27 @@ try { // 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")'); - void (async () => { + const acceptIfRequired = async () => { try { await btnAgree.waitFor({ timeout: 10000 }); await btnAgree.click(); } catch { return; } - })(); // EU: wait for and click 'I Agree' + }; // EU: wait for and click 'I Agree' + acceptIfRequired(); try { // context.setDefaultTimeout(100 * 1000); // give time to solve captcha, iframe goes blank after 60s? const captcha = iframe.locator('#h_captcha_challenge_checkout_free_prod iframe'); - void (async () => { + const watchCaptchaChallenge = async () => { try { await captcha.waitFor({ timeout: 10000 }); console.error(' Got hcaptcha challenge! Lost trust due to too many login attempts? You can solve the captcha in the browser or get a new IP address.'); } catch { return; } - })(); // may time out if not shown + }; // may time out if not shown + watchCaptchaChallenge(); await page.waitForSelector('text=Thank you'); for (const id of ids) { db.data[user][id].status = 'claimed'; From a477bb332791a7190fc686a82b6f9f65812abbc8 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:47:46 +0000 Subject: [PATCH 160/167] Fix lint: guard browser globals and normalize indentation --- epic-games.js | 2 +- prime-gaming.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epic-games.js b/epic-games.js index d7eb80d..941383f 100644 --- a/epic-games.js +++ b/epic-games.js @@ -50,7 +50,7 @@ await page.setViewportSize({ width: cfg.width, height: cfg.height }); // workaro // some debug info about the page (screen dimensions, user agent) if (cfg.debug) { - // eslint-disable-next-line no-undef + /* global window, navigator */ const debugInfo = await page.evaluate(() => { const { width, height, availWidth, availHeight } = window.screen; return { diff --git a/prime-gaming.js b/prime-gaming.js index 47d7c70..a09cbca 100644 --- a/prime-gaming.js +++ b/prime-gaming.js @@ -527,12 +527,12 @@ try { } else if (reason == 'code_not_found') { redeem_action = 'redeem (not found)'; console.error(' Code was not found!'); - } else { // unknown state; keep info log for later analysis - redeem_action = 'redeemed?'; - console.debug(` Response 1: ${r1t}`); - const r2 = page2.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://redeem.gog.com/')); - await page2.click('[type="submit"]'); // click Redeem - const r2t = await (await r2).text(); + } else { // unknown state; keep info log for later analysis + redeem_action = 'redeemed?'; + console.debug(` Response 1: ${r1t}`); + const r2 = page2.waitForResponse(r => r.request().method() == 'POST' && r.url().startsWith('https://redeem.gog.com/')); + await page2.click('[type="submit"]'); // click Redeem + const r2t = await (await r2).text(); const reason2 = JSON.parse(r2t).reason; if (r2t == '{}') { redeem_action = 'redeemed'; @@ -609,8 +609,8 @@ try { } else { notify_game.status = `claimed on ${store}`; db.data[user][title].status = 'claimed'; - } - await page.screenshot({ path: screenshot('external', `${filenamify(title)}.png`), fullPage: true }); + } + await page.screenshot({ path: screenshot('external', `${filenamify(title)}.png`), fullPage: true }); } } await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); From e3e6a6f36c12a02c65154c450115c998302f0651 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:54:42 +0000 Subject: [PATCH 161/167] Handle unwritable browser volume in entrypoint --- docker-entrypoint.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5837164..33a76e6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -16,13 +16,17 @@ rm -f /fgc/data/browser/SingletonLock # Since this file has to be in the volume (data/browser), we can't do this in Dockerfile. mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 -# echo 'user_pref("privacy.resistFingerprinting", true);' > /fgc/data/browser/user.js -cat << EOT > /fgc/data/browser/user.js +# Only write the prefs file when the volume is writable (container runs as non-root). +if [ -w /fgc/data/browser ]; then + cat << EOT > /fgc/data/browser/user.js user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); // user_pref("webgl.disabled", true); EOT +else + echo "Warning: /fgc/data/browser is not writable; skipping user.js creation." +fi # TODO disable session restore message? # Remove X server display lock, fix for `docker compose up` which reuses container which made it fail after initial run, https://github.com/vogler/free-games-claimer/issues/31 From 6f2e1e5b22493dceaf4455be8b19e5680704d312 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 16:58:22 +0000 Subject: [PATCH 162/167] Make browser prefs creation non-fatal when unwritable --- docker-entrypoint.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 33a76e6..42de464 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,22 +10,24 @@ echo "Build: $NOW" # When running in docker and then killing it, on the next run chromium displayed a dialog to unlock the profile which made the script time out. # Maybe due to changed hostname of container or due to how the docker container kills playwright - didn't check. # https://bugs.chromium.org/p/chromium/issues/detail?id=367048 -rm -f /fgc/data/browser/SingletonLock +rm -f /fgc/data/browser/SingletonLock 2>/dev/null || true # Firefox preferences are stored in $BROWSER_DIR/pref.js and can be overridden by a file user.js # Since this file has to be in the volume (data/browser), we can't do this in Dockerfile. mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # Only write the prefs file when the volume is writable (container runs as non-root). -if [ -w /fgc/data/browser ]; then - cat << EOT > /fgc/data/browser/user.js +if [ -w /fgc/data/browser ] && ( [ ! -e /fgc/data/browser/user.js ] || [ -w /fgc/data/browser/user.js ] ); then + if ! cat << 'EOT' > /fgc/data/browser/user.js; then + echo "Warning: failed to write /fgc/data/browser/user.js (permission issue?)." >&2 + fi user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); // user_pref("webgl.disabled", true); EOT else - echo "Warning: /fgc/data/browser is not writable; skipping user.js creation." + echo "Warning: /fgc/data/browser not writable; skipping user.js creation." fi # TODO disable session restore message? From 4d835013cce7951ab988802082ca1d88fd85a0e6 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 17:05:01 +0000 Subject: [PATCH 163/167] Skip browser prefs when volume is read-only --- docker-entrypoint.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 42de464..183905e 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -17,10 +17,9 @@ rm -f /fgc/data/browser/SingletonLock 2>/dev/null || true mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # Only write the prefs file when the volume is writable (container runs as non-root). -if [ -w /fgc/data/browser ] && ( [ ! -e /fgc/data/browser/user.js ] || [ -w /fgc/data/browser/user.js ] ); then - if ! cat << 'EOT' > /fgc/data/browser/user.js; then - echo "Warning: failed to write /fgc/data/browser/user.js (permission issue?)." >&2 - fi +if touch /fgc/data/browser/.write-test 2>/dev/null; then + rm -f /fgc/data/browser/.write-test 2>/dev/null || true + cat << 'EOT' > /fgc/data/browser/user.js 2>/dev/null || echo "Warning: failed to write /fgc/data/browser/user.js (permission issue?)." >&2 user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); From cfc1e0ee123cf28e07c63b0cf0e00755154cfac3 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 17:10:53 +0000 Subject: [PATCH 164/167] Harden entrypoint: skip user.js on RO volume and auto-install browsers --- docker-entrypoint.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 183905e..f18201d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -17,9 +17,8 @@ rm -f /fgc/data/browser/SingletonLock 2>/dev/null || true mkdir -p /fgc/data/browser # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # Only write the prefs file when the volume is writable (container runs as non-root). -if touch /fgc/data/browser/.write-test 2>/dev/null; then - rm -f /fgc/data/browser/.write-test 2>/dev/null || true - cat << 'EOT' > /fgc/data/browser/user.js 2>/dev/null || echo "Warning: failed to write /fgc/data/browser/user.js (permission issue?)." >&2 +if [ -w /fgc/data/browser ] && { [ ! -e /fgc/data/browser/user.js ] || [ -w /fgc/data/browser/user.js ] || rm -f /fgc/data/browser/user.js 2>/dev/null; }; then + cat << 'EOT' > /fgc/data/browser/user.js user_pref("privacy.resistFingerprinting", true); // user_pref("privacy.resistFingerprinting.letterboxing", true); // user_pref("browser.contentblocking.category", "strict"); @@ -57,4 +56,11 @@ echo "VNC is running on port $VNC_PORT ($pwt)" websockify -D --web "/usr/share/novnc/" $NOVNC_PORT "localhost:$VNC_PORT" 2>/dev/null 1>&2 & echo "noVNC (VNC via browser) is running on http://localhost:$NOVNC_PORT" echo + +# Ensure Playwright browsers are available (chromium + firefox). +if [ ! -x /home/fgc/.cache/ms-playwright/firefox-1482/firefox/firefox ] || ! ls /home/fgc/.cache/ms-playwright/chromium-*/*/chrome >/dev/null 2>&1; then + echo "Playwright browsers missing; installing..." + npx playwright install chromium firefox || echo "Warning: failed to install Playwright browsers" >&2 +fi + exec tini -g -- "$@" # https://github.com/krallin/tini/issues/8 node/playwright respond to signals like ctrl-c, but unsure about zombie processes From 949206dbf25f8f509ce283b31d549e76a85a99cb Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 17:21:53 +0000 Subject: [PATCH 165/167] Ensure /tmp/.X11-unix exists with sane perms --- docker-entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index f18201d..870d4c9 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -34,6 +34,12 @@ fi # ls -l /tmp/.X11-unix/ rm -f /tmp/.X1-lock +# Ensure X11 socket dir exists with sane ownership/permissions. +mkdir -p /tmp/.X11-unix +if [ "$(stat -c %U /tmp/.X11-unix 2>/dev/null)" != "root" ]; then + chown root:root /tmp/.X11-unix 2>/dev/null || chmod 1777 /tmp/.X11-unix +fi + # 6000+SERVERNUM is the TCP port Xvfb is listening on: # SERVERNUM=$(echo "$DISPLAY" | sed 's/:\([0-9][0-9]*\).*/\1/') From 8ebb57a7067f06f5ba35cc31974f7e798b7d9fdb Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 17:27:28 +0000 Subject: [PATCH 166/167] Add missing Playwright deps and clear Firefox locks on start --- Dockerfile | 3 +++ docker-entrypoint.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index a3dcbc9..cac91cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,6 +34,9 @@ RUN apt-get update \ libgdk-pixbuf-2.0-0 \ libdbus-glib-1-2 \ libxcursor1 \ + libnss3 \ + libnspr4 \ + libgbm1 \ && apt-get autoremove -y \ && apt-get clean \ && rm -rf \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 870d4c9..b5f5863 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -15,6 +15,8 @@ rm -f /fgc/data/browser/SingletonLock 2>/dev/null || true # Firefox preferences are stored in $BROWSER_DIR/pref.js and can be overridden by a file user.js # Since this file has to be in the volume (data/browser), we can't do this in Dockerfile. mkdir -p /fgc/data/browser +# clean up stale firefox locks that can trigger "already running" +rm -f /fgc/data/browser/parent.lock /fgc/data/browser/lock /fgc/data/browser/.parentlock 2>/dev/null || true # fix for 'Incorrect response' after solving a captcha correctly - https://github.com/vogler/free-games-claimer/issues/261#issuecomment-1868385830 # Only write the prefs file when the volume is writable (container runs as non-root). if [ -w /fgc/data/browser ] && { [ ! -e /fgc/data/browser/user.js ] || [ -w /fgc/data/browser/user.js ] || rm -f /fgc/data/browser/user.js 2>/dev/null; }; then From 67afeead600a0e4d165ed52406faa8eceb48012e Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 30 Dec 2025 17:36:31 +0000 Subject: [PATCH 167/167] chore: chown /fgc/data on start so fgc can write bind-mount --- docker-entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b5f5863..e604e7c 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -6,6 +6,11 @@ echo "Version: https://github.com/vogler/free-games-claimer/tree/${COMMIT}" [ ! -z $BRANCH ] && [ $BRANCH != "main" ] && echo "Branch: ${BRANCH}" echo "Build: $NOW" +# Ensure writable data dir for fgc when host bind-mount is owned by root. +if [ "$(id -u)" -eq 0 ]; then + chown -R 1000:1000 /fgc/data 2>/dev/null || true +fi + # Remove chromium profile lock. # When running in docker and then killing it, on the next run chromium displayed a dialog to unlock the profile which made the script time out. # Maybe due to changed hostname of container or due to how the docker container kills playwright - didn't check.