fix merge conflicts

.env-example

@@ -18,6 +18,13 @@ MAX_PRICE_SERIES_3070=
 MAX_PRICE_SERIES_3080=
 MAX_PRICE_SERIES_3090=
 MICROCENTER_LOCATION=
+MQTT_BROKER_ADDRESS=
+MQTT_BROKER_PORT=
+MQTT_CLIENT_ID=
+MQTT_PASSWORD=
+MQTT_QOS=
+MQTT_TOPIC=
+MQTT_USERNAME=
 NVIDIA_ADD_TO_CART_ATTEMPTS=
 NVIDIA_SESSION_TTL=
 OPEN_BROWSER=

.github/workflows/ci.yaml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v2.5.0
         id: changes
         with:
           filters: |

Dockerfile

@@ -1,5 +1,5 @@
 # Build the source code
-FROM node:14.13.1-alpine3.12 AS builder
+FROM node:14.14.0-alpine3.12 AS builder
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
@@ -14,7 +14,7 @@ COPY src/ src/
 RUN npm run build
 RUN npm prune --production
 
-FROM node:14.13.1-alpine3.12
+FROM node:14.14.0-alpine3.12
 
 RUN apk add --no-cache chromium
 

README.md

@@ -88,13 +88,21 @@ Here is a list of variables that you can use to customize your newly copied `.en
 | `EMAIL_TO` | Destination Email | Defaults to username if not set. Can be comma separated |
 | `EMAIL_USERNAME` | Gmail address | E.g.: `jensen.robbed.us@gmail.com` |
 | `HEADLESS` | Puppeteer to run headless or not | Debugging related, default: `true` |
+| `INCOGNITO` | Puppeteer to run incognito or not | Debugging related, default: `false` |
 | `IN_STOCK_WAIT_TIME` | Time to wait between requests to the same link if it has that card in stock | In seconds, default: `0` |
 | `LOG_LEVEL` | [Logging levels](https://github.com/winstonjs/winston#logging-levels) | Debugging related, default: `info` |
 | `LOW_BANDWIDTH` | Blocks images/fonts to reduce traffic | Disables ad blocker, default: `false` |
 | `MAX_PRICE_SERIES_3070` | Maximum price allowed for a match, applies 3070 series cards (does not apply to these sites: Nvidia, Asus, EVGA) | Default: leave empty for no limit, otherwise enter a price (enter whole dollar amounts only, avoid use of: dollar symbols, commas, and periods.) e.g.: `1234` - Cards above `1234` will be skipped. |
 | `MAX_PRICE_SERIES_3080` | Maximum price allowed for a match, applies 3080 series cards (does not apply to these sites: Nvidia, Asus, EVGA) | Default: leave empty for no limit, otherwise enter a price (enter whole dollar amounts only, avoid use of: dollar symbols, commas, and periods.) e.g.: `1234` - Cards above `1234` will be skipped. |
 | `MAX_PRICE_SERIES_3090` | Maximum price allowed for a match, applies 3090 series cards (does not apply to these sites: Nvidia, Asus, EVGA) | Default: leave empty for no limit, otherwise enter a price (enter whole dollar amounts only, avoid use of: dollar symbols, commas, and periods.) e.g.: `1234` - Cards above `1234` will be skipped. |
 | `MICROCENTER_LOCATION` | Specific MicroCenter location(s) to search | Comma separated, e.g.: `marietta,duluth`, default: `web` |
+| `MQTT_BROKER_ADDRESS` | IP address or URL of MQTT Broker | e.g 192.168.1.xxx or broker.hivemq.com
+| `MQTT_BROKER_PORT` | Network port of MQTT Broker | Default: 1883
+| `MQTT_CLIENT_ID` | Unique ClientID (only if required by MQTT Broker), typically not required when only publishing alerts | eg. client-123456
+| `MQTT_PASSWORD` | MQTT password - only use with MQTT brokers on private networks, if required.  Will not be sent over public networks for safety. | e.g mysecret
+| `MQTT_QOS` | QoS level for published alerts to broker (https://www.npmjs.com/package/mqtt#about-qos) | Default: 0, Can be 0, 1, or 2
+| `MQTT_TOPIC` | Topic to publish alerts to.  Can include %store%, %series%, %brand%, %model% for dynamic topics | Default: nvidia-snatcher/alert e.g nv-alert/%store%/%series%/%brand%/%model%/alert
+| `MQTT_USERNAME` | MQTT username - (only if required by MQTT Broker) | e.g myusername
 | `NVIDIA_ADD_TO_CART_ATTEMPTS` | The maximum number of times the `nvidia-api` add to cart feature will be attempted before failing | Default: `10` |
 | `NVIDIA_SESSION_TTL` | The time in milliseconds to keep the cart active while using `nvidia-api` | Default: `60000` |
 | `OPEN_BROWSER` | Toggle for whether or not the browser should open when item is found | Default: `true` |
@@ -133,12 +141,16 @@ Here is a list of variables that you can use to customize your newly copied `.en
 | `TWITTER_CONSUMER_KEY` | Twitter Consumer Key | Generate all Twitter keys at: https://developer.twitter.com/ |
 | `TWITTER_CONSUMER_SECRET` | Twitter Consumer Secret | |
 | `TWITTER_TWEET_TAGS` | Optional list of hashtags to append to the tweet message | E.g.: `#nvidia #nvidiastock` |
+<<<<<<< HEAD
 | `TWITCH_CLIENT_ID` | Twitch client ID | |
 | `TWITCH_CLIENT_SECRET`| Twitch client secret | |
 | `TWITCH_ACCESS_TOKEN` | Twitch access token | |
 | `TWITCH_REFRESH_TOKEN` | Twitch refresh token | |
 | `TWITCH_CHANNEL` | Twitch channel | |
 | `USER_AGENT` | Custom User-Agent header for HTTP requests | Default: `Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36` |
+=======
+| `USER_AGENT` | Custom User-Agents headers for HTTP requests | Newline separated, E.g.: `USER_AGENT_STRING1 \n USER_AGENT_STRING2` | | Default: `Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36` |
+>>>>>>> 58416e1994006cc2e4055937c675e0f9191f6339
 
 > :point_right: If you have multi-factor authentication (MFA), you will need to create an [app password](https://myaccount.google.com/apppasswords) and use this instead of your Gmail password.
 
@@ -154,14 +166,20 @@ Here is a list of variables that you can use to customize your newly copied `.en
 |:---:|:---:|
 | Adorama | `adorama`|
 | Alternate (DE) | `alternate`|
+| Alternate (NL) | `alternate-nl`|
 | Amazon | `amazon`|
 | Amazon (CA) | `amazon-ca`|
 | Amazon (DE) | `amazon-de`|
+| Amazon (ES) | `amazon-es`|
 | Amazon (NL) | `amazon-nl`|
 | Amazon (UK) | `amazon-uk`|
 | Aria PC | `aria`|
 | ASUS | `asus` |
+<<<<<<< HEAD
 | ASUS (DE) | `asus-de` |
+=======
+| Azerty | `azerty`|
+>>>>>>> 58416e1994006cc2e4055937c675e0f9191f6339
 | B&H | `bandh`|
 | Best Buy | `bestbuy`|
 | Best Buy (CA) | `bestbuy-ca`|
@@ -187,6 +205,7 @@ Here is a list of variables that you can use to customize your newly copied `.en
 | Nvidia (API) | `nvidia-api`|
 | Office Depot | `officedepot`|
 | Overclockers | `overclockers`|
+| PCComponentes | `pccomponentes`|
 | PNY | `pny`|
 | Proshop (DE) | `proshop-de`|
 | Proshop (DK) | `proshop-dk`|