Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jef authored May 27, 2021
2 parents f6cdc5f + 9ba964a commit 42fba9c
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 16.1.0
node-version: 16.2.0
- name: Setup build cache
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.1.0
16.2.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.1.0-alpine3.13 AS builder
FROM node:16.2.0-alpine3.13 AS builder

LABEL org.opencontainers.image.source="https://github.com/jef/streetmerchant"

Expand All @@ -16,7 +16,7 @@ COPY test/ test/
RUN npm run compile
RUN npm prune --production

FROM node:16.1.0-alpine3.13
FROM node:16.2.0-alpine3.13

RUN apk add --no-cache chromium

Expand Down
2 changes: 0 additions & 2 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ theme:
font:
text: Roboto
code: Fira Code
icon:
repo: octicons/octoface-24
logo: assets/images/streetmerchant-logo.png
language: en
name: material
Expand Down
74 changes: 37 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
"node-notifier": "^9.0.1",
"node-pagerduty": "^1.3.6",
"nodemailer": "^6.6.0",
"open": "8.0.2",
"open": "8.2.0",
"play-sound": "^1.1.3",
"puppeteer": "^9.1.1",
"puppeteer-extra-plugin-adblocker": "^2.11.11",
"pushover-notifications": "^1.2.2",
"redis": "^3.1.2",
"top-user-agents": "^1.0.25",
"twilio": "^3.62.0",
"top-user-agents": "^1.0.26",
"twilio": "^3.63.0",
"twitch": "^4.5.5",
"twitch-auth": "^4.5.5",
"twitch-chat-client": "^4.5.5",
Expand All @@ -69,7 +69,7 @@
"@types/async": "^3.2.6",
"@types/cheerio": "^0.22.28",
"@types/mocha": "^8.2.2",
"@types/node": "^15.3.0",
"@types/node": "^15.6.1",
"@types/node-fetch": "^2.5.10",
"@types/node-notifier": "^8.0.0",
"@types/nodemailer": "^6.4.1",
Expand All @@ -83,9 +83,9 @@
"sinon": "^10.0.0",
"ts-node": "^9.1.1",
"typescript": "^4.2.4",
"webpack": "^5.37.0"
"webpack": "^5.37.1"
},
"volta": {
"node": "16.1.0"
"node": "16.2.0"
}
}
9 changes: 9 additions & 0 deletions src/store/lookup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,15 @@ async function lookup(browser: Browser, store: Store) {
await disableBlockerInPage(pageProxy);
}

if (
store.currentProxyIndex !== undefined &&
store.proxyList &&
store.proxyList?.length > 1
) {
const client = await page.target().createCDPSession();
await client.send('Network.clearBrowserCookies');
}

// Must apply backoff before closing the page, e.g. if CloudFlare is
// used to detect bot traffic, it introduces a 5 second page delay
// before redirecting to the next page
Expand Down
6 changes: 6 additions & 0 deletions src/store/model/alternate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,12 @@ export const Alternate: Store = {
series: 'sonyps5c',
url: 'https://www.alternate.de/html/product/1651220',
},
{
brand: 'sony',
model: 'ps5 console',
series: 'sonyps5c',
url: 'https://www.alternate.de/html/product/1750947',
},
{
brand: 'sony',
model: 'ps5 console',
Expand Down

0 comments on commit 42fba9c

Please sign in to comment.