Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sms carrier config, add google carrier #44

Merged
merged 4 commits into from
Sep 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ SLACK_CHANNEL="SlackChannelName"
SLACK_TOKEN="slack-token"
STORES="bestbuy,bandh,nvidia"
PHONE_NUMBER="1234567890"
CARRIER="tmobile"
PHONE_CARRIER="tmobile"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ First, you're going to need to copy the `.env.example` to `.env`. The current op
| `NOTIFICATION_TEST` | Test all the notifications configured; optional, default: `false` |
| `PAGE_TIMEOUT` | Navigation Timeout in milliseconds (`0` for infinite); optional, default: `30000` |
| `PHONE_NUMBER` | 10 digit phone number, only USA, SMS may apply (e.g., `1234567890`); optional, email configuration required |
| `PHONE_CARRIER` | Service provider for SMS, supports `["sprint", "tmobile", "att", "verizon"]`; optional, email configuration required |
| `PHONE_CARRIER` | Service provider for SMS, supports `["sprint", "tmobile", "att", "verizon", "google"]`; optional, email configuration required |
| `RATE_LIMIT_TIMEOUT` | Rate limit timeout for each full store cycle; optional, default: `5000` |
| `SLACK_CHANNEL` | Slack channel for posting (e.g., `update`); optional |
| `SLACK_TOKEN` | Slack API token; optional
Expand Down
2 changes: 1 addition & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const notifications = {
password: process.env.EMAIL_PASSWORD ?? ''
},
phone: {
availableCarriers: ['sprint', 'verizon', 'tmobile', 'att'],
availableCarriers: ['sprint', 'verizon', 'tmobile', 'att', 'google'],
carrier: process.env.PHONE_CARRIER,
number: process.env.PHONE_NUMBER
},
Expand Down
5 changes: 3 additions & 2 deletions src/notification/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ export default function sendNotification(cartUrl: string) {
sendSlaskMessage(cartUrl);
}

if (Config.notifications.phone.number && Config.notifications.phone.carrier) {
if (Config.notifications.phone.availableCarriers.includes(Config.notifications.phone.carrier.toLowerCase())) {
if (Config.notifications.phone.number) {
const carrier = Config.notifications.phone.carrier?.toLowerCase();
if (carrier && Config.notifications.phone.availableCarriers.includes(carrier)) {
sendSMS(cartUrl);
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/notification/sms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ enum carrierAddress {
sprint = 'messaging.sprintpcs.com',
verizon = 'vtext.com',
tmobile = 'tmomail.net',
att = 'txt.att.net'
att = 'txt.att.net',
google = 'msg.fi.google.com'
}

const transporter = nodemailer.createTransport({
Expand All @@ -34,16 +35,15 @@ export default function sendSMS(text: string) {
Logger.error(error);
} else {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
Logger.info(`✔ email sent: ${info.response}`);
Logger.info(`✔ sms sent: ${info.response}`);
}
});
}

function generateAddress() {
for (const carrier of Object.keys(carrierAddress)) {
if (Config.notifications.phone.carrier && carrier === Config.notifications.phone.carrier.toLowerCase()) {
// @ts-expect-error
return [Config.phone.number, carrierAddress[carrier]].join('@');
}
const carrier = Config.notifications.phone.carrier?.toLowerCase();
if (carrier && Object.keys(carrierAddress).includes(carrier)) {
// @ts-expect-error
return [Config.notifications.phone.number, carrierAddress[carrier]].join('@');
}
}