public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated packages.

Browse source 
Merged #763 + some variable renaming
This commit is contained in:
Tomas Bures 2019-12-07 09:28:17 +01:00
parent e61e0fb802
commit cd2fdb9e23
12 changed files with 2405 additions and 2879 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/lib/message-sender.js
View file

@ -14,7 +14,7 @@ const sendConfigurations = require('../models/send-configurations');
const links = require('../models/links');
const {CampaignSource, CampaignType} = require('../../shared/campaigns');
const {toNameTagLangauge} = require('../../shared/lists');
const {CampaignMessageStatus, CampaignMessageErrorCode} = require('../../shared/campaigns');
const {CampaignMessageStatus, CampaignMessageErrorType} = require('../../shared/campaigns');
const tools = require('./tools');
const htmlToText = require('html-to-text');
const request = require('request-promise');
@ -209,17 +209,17 @@ class MessageSender {
form,
resolveWithFullResponse: true
});
} catch (e) {
} catch (exc) {
log.error('MessageSender', `Error pulling content from URL (${sourceUrl})`);
response = {statusCode: e.message};
response = {statusCode: exc.message};
}
if (response.statusCode !== 200) {
const statusError = new Error(`Received status code ${response.statusCode} from ${sourceUrl}`);
if (response.statusCode >= 500) {
statusError.code = CampaignMessageErrorCode.RETRY;
statusError.campaignMessageErrorType = CampaignMessageErrorType.TRANSIENT;
} else {
statusError.code = CampaignMessageErrorCode.NORETRY;
statusError.campaignMessageErrorType = CampaignMessageErrorType.PERMANENT;
}
throw statusError;
}
@ -516,7 +516,7 @@ class MessageSender {
try {
result = await this._sendMessage({listId: campaignMessage.list, subscriptionId: campaignMessage.subscription});
} catch (err) {
if (err.code === CampaignMessageErrorCode.NORETRY) {
if (err.campaignMessageErrorType === CampaignMessageErrorType.PERMANENT) {
await knex('campaign_messages')
.where({id: campaignMessage.id})
.update({

1259
server/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

38
server/package.json
View file

@ -26,7 +26,7 @@
"node": ">=10.0.0"
},
"devDependencies": {
"babel-eslint": "^10.0.2",
"babel-eslint": "^10.0.3",
"chai": "^4.2.0",
"eslint-config-nodemailer": "^1.2.0",
"grunt": "^1.0.3",
@ -42,37 +42,37 @@
"posix": "^4.1.2"
},
"dependencies": {
"aws-sdk": "^2.497.0",
"aws-sdk": "^2.585.0",
"bcrypt-nodejs": "0.0.3",
"bluebird": "^3.5.5",
"bluebird": "^3.7.2",
"body-parser": "^1.19.0",
"bounce-handler": "7.3.2-fork.3",
"capitalize": "^2.0.0",
"capitalize": "^2.0.1",
"compression": "^1.7.3",
"config": "^3.2.2",
"config": "^3.2.4",
"connect-flash": "^0.1.1",
"connect-redis": "^3.4.2",
"cookie-parser": "^1.4.3",
"cors": "^2.8.5",
"crypto": "^1.0.1",
"csurf": "^1.10.0",
"csv-parse": "^4.4.3",
"csv-stringify": "^5.1.2",
"csv-parse": "^4.8.2",
"csv-stringify": "^5.3.4",
"device": "^0.3.9",
"dompurify": "^1.0.11",
"escape-html": "^1.0.3",
"escape-string-regexp": "^1.0.5",
"express": "^4.17.1",
"express-locale": "^1.0.5",
"express-session": "^1.16.2",
"express-session": "^1.17.0",
"faker": "^4.1.0",
"feedparser-promised": "^2.0.1",
"fs-extra": "^7.0.1",
"fs-extra-promise": "^1.0.1",
"geoip-ultralight": "^0.1.5",
"gm": "^1.23.1",
"handlebars": "^4.0.12",
"hbs": "^4.0.1",
"handlebars": "^4.5.3",
"hbs": "^4.0.6",
"he": "^1.2.0",
"html-to-text": "^4.0.0",
"humanize": "0.0.9",
@ -83,31 +83,31 @@
"juice": "^5.2.0",
"klaw-sync": "^6.0.0",
"knex": "^0.16.5",
"libmime": "^4.1.3",
"mailparser": "^2.7.1",
"libmime": "^4.2.1",
"mailparser": "^2.7.7",
"memory-cache": "^0.2.0",
"mjml": "^4.4.0",
"mjml": "^4.5.1",
"moment": "^2.23.0",
"moment-timezone": "^0.5.26",
"moment-timezone": "^0.5.27",
"morgan": "^1.9.1",
"multer": "^1.4.2",
"mysql": "^2.17.1",
"node-ipc": "^9.1.1",
"node-mocks-http": "^1.7.6",
"node-mocks-http": "^1.8.0",
"node-object-hash": "^1.4.1",
"nodeify": "^1.0.1",
"nodemailer": "^5.0.0",
"nodemailer-openpgp": "^1.2.0",
"npmlog": "^4.1.2",
"openpgp": "^4.5.5",
"openpgp": "^4.7.1",
"passport": "^0.4.0",
"passport-local": "^1.0.0",
"premailer-api": "^1.0.4",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"request-promise": "^4.2.5",
"serve-favicon": "^2.5.0",
"shortid": "^2.2.14",
"slugify": "^1.3.4",
"shortid": "^2.2.15",
"slugify": "^1.3.6",
"smtp-server": "^3.4.7",
"tmp-promise": "^1.1.0",
"toml": "^2.3.3",