opelly/streetmerchant
1
0
Fork 0
mirror of https://github.com/opelly27/streetmerchant.git synced 2026-05-20 05:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sms carrier config, add google carrier (#44)

Browse Source
This commit is contained in:
admon84
2020-09-18 19:39:30 -06:00
committed by GitHub
parent d73449dd7f
commit 971fec20e4
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+1 -1
View File
@@ -7,4 +7,4 @@ SLACK_CHANNEL="SlackChannelName"
SLACK_TOKEN="slack-token" SLACK_TOKEN="slack-token"
STORES="bestbuy,bandh,nvidia" STORES="bestbuy,bandh,nvidia"
PHONE_NUMBER="1234567890" PHONE_NUMBER="1234567890"
CARRIER="tmobile" PHONE_CARRIER="tmobile"
README.md
+1 -1
View File
@@ -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` | | `NOTIFICATION_TEST` | Test all the notifications configured; optional, default: `false` |
| `PAGE_TIMEOUT` | Navigation Timeout in milliseconds (`0` for infinite); optional, default: `30000` | | `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_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` | | `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_CHANNEL` | Slack channel for posting (e.g., `update`); optional |
| `SLACK_TOKEN` | Slack API token; optional | `SLACK_TOKEN` | Slack API token; optional
src/config.ts
+1 -1
View File
@@ -9,7 +9,7 @@ const notifications = {
password: process.env.EMAIL_PASSWORD ?? '' password: process.env.EMAIL_PASSWORD ?? ''
}, },
phone: { phone: {
availableCarriers: ['sprint', 'verizon', 'tmobile', 'att'], availableCarriers: ['sprint', 'verizon', 'tmobile', 'att', 'google'],
carrier: process.env.PHONE_CARRIER, carrier: process.env.PHONE_CARRIER,
number: process.env.PHONE_NUMBER number: process.env.PHONE_NUMBER
}, },
src/notification/index.ts
+3 -2
View File
@@ -12,8 +12,9 @@ export default function sendNotification(cartUrl: string) {
sendSlaskMessage(cartUrl); sendSlaskMessage(cartUrl);
} }
if (Config.notifications.phone.number && Config.notifications.phone.carrier) { if (Config.notifications.phone.number) {
if (Config.notifications.phone.availableCarriers.includes(Config.notifications.phone.carrier.toLowerCase())) { const carrier = Config.notifications.phone.carrier?.toLowerCase();
if (carrier && Config.notifications.phone.availableCarriers.includes(carrier)) {
sendSMS(cartUrl); sendSMS(cartUrl);
} }
} }
src/notification/sms.ts
+7 -7
View File
@@ -9,7 +9,8 @@ enum carrierAddress {
sprint = 'messaging.sprintpcs.com', sprint = 'messaging.sprintpcs.com',
verizon = 'vtext.com', verizon = 'vtext.com',
tmobile = 'tmomail.net', tmobile = 'tmomail.net',
att = 'txt.att.net' att = 'txt.att.net',
google = 'msg.fi.google.com'
} }
const transporter = nodemailer.createTransport({ const transporter = nodemailer.createTransport({
@@ -34,16 +35,15 @@ export default function sendSMS(text: string) {
Logger.error(error); Logger.error(error);
} else { } else {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
Logger.info(`✔ email sent: ${info.response}`); Logger.info(`✔ sms sent: ${info.response}`);
} }
}); });
} }
function generateAddress() { function generateAddress() {
for (const carrier of Object.keys(carrierAddress)) { const carrier = Config.notifications.phone.carrier?.toLowerCase();
if (Config.notifications.phone.carrier && carrier === Config.notifications.phone.carrier.toLowerCase()) { if (carrier && Object.keys(carrierAddress).includes(carrier)) {
// @ts-expect-error // @ts-expect-error
return [Config.phone.number, carrierAddress[carrier]].join('@'); return [Config.notifications.phone.number, carrierAddress[carrier]].join('@');
}
} }
} }