spamscanner 5.1.2 → 5.1.5

package/README.md

@@ -566,7 +566,7 @@ Note that in [Forward Email][forward-email] we use the `client` approach as we h
 
 ## Debugging
 
-Spam Scanner has built-in debug output via `util.debuglog('spamscanner')`.
+Spam Scanner has built-in debug output via `util.debuglog('spamscanner')`.  You can also pass `debug: true` to your instance to get more verbose output.
 
 This means you can run your app with `NODE_DEBUG=spamscanner node app.js` to get useful debug output to your console.
 

package/get-classifier.js

@@ -1,5 +1,8 @@
+const { debuglog } = require('util');
+
 const NaiveBayes = require('@ladjs/naivebayes');
-const debug = require('debug')('spamscanner');
+
+const debug = debuglog('spamscanner');
 
 let classifier = new NaiveBayes().toJsonObject();
 

package/index.js

@@ -13,11 +13,11 @@ const NaiveBayes = require('@ladjs/naivebayes');
 const RE2 = require('re2');
 const arrayJoinConjunction = require('array-join-conjunction');
 const bitcoinRegex = require('bitcoin-regex');
-const contractions = require('expand-contractions');
 const creditCardRegex = require('credit-card-regex');
 const emailRegexSafe = require('email-regex-safe');
 const emojiPatterns = require('emoji-patterns');
 const escapeStringRegexp = require('escape-string-regexp');
+const expandContractions = require('@stdlib/nlp-expand-contractions');
 const fileExtension = require('file-extension');
 const floatingPointRegex = require('floating-point-regex');
 const franc = require('franc');
@@ -496,7 +496,7 @@ class SpamScanner {
       return tokens;
     };
 
-    this.clamscan = new ClamScan();
+    this.clamscan = this.config.clamscan === false ? false : new ClamScan();
 
     this.getTokensAndMailFromSource = universalify.fromPromise(
       this.getTokensAndMailFromSource.bind(this)
@@ -654,7 +654,13 @@ class SpamScanner {
   async getVirusResults(mail) {
     const messages = [];
 
-    if (!Array.isArray(mail.attachments)) return messages;
+    if (!this.clamscan) {
+      debug('clamscan disabled');
+      return messages;
+    }
+
+    if (!Array.isArray(mail.attachments) || mail.attachments.length === 0)
+      return messages;
 
     try {
       // if it was already loaded, clamscan won't reload itself
@@ -1258,7 +1264,7 @@ class SpamScanner {
     //
     // NOTE: we're doing this for all languages now, not just en
     //
-    string = contractions.expand(string);
+    string = expandContractions(string);
 
     //
     // Future research:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spamscanner",
   "description": "Spam Scanner - The Best Anti-Spam Scanning Service and Anti-Spam API",
-  "version": "5.1.2",
+  "version": "5.1.5",
   "author": "Niftylettuce, LLC. <niftylettuce@gmail.com> (https://niftylettuce.com/)",
   "bugs": {
     "url": "https://github.com/spamscanner/spamscanner/issues",
@@ -13,6 +13,7 @@
   ],
   "dependencies": {
     "@ladjs/naivebayes": "^0.1.0",
+    "@stdlib/nlp-expand-contractions": "^0.0.8",
     "array-join-conjunction": "^1.0.0",
     "bitcoin-regex": "^2.0.0",
     "chinese-tokenizer": "^2.4.0",
@@ -24,7 +25,6 @@
     "email-regex-safe": "^1.0.2",
     "emoji-patterns": "^14.0.1",
     "escape-string-regexp": "4",
-    "expand-contractions": "^1.0.1",
     "file-extension": "^4.0.5",
     "file-type": "16",
     "floating-point-regex": "^0.1.0",
@@ -69,6 +69,7 @@
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
     "ava": "^4.3.0",
+    "chance": "^1.1.8",
     "cross-env": "^7.0.3",
     "delay": "^5.0.0",
     "eslint": "^8.17.0",
@@ -85,9 +86,11 @@
     "numeral": "^2.0.6",
     "nyc": "^15.1.0",
     "p-map": "4",
+    "p-queue": "6",
     "read-dir-deep": "^7.0.1",
     "remark-cli": "^10.0.1",
     "remark-preset-github": "^4.0.4",
+    "semver": "^7.3.7",
     "xo": "^0.50.0"
   },
   "engines": {

package/replacements.js

@@ -1,5 +1,8 @@
+const { debuglog } = require('util');
+
 const cryptoRandomString = require('crypto-random-string');
-const debug = require('debug')('spamscanner');
+
+const debug = debuglog('spamscanner');
 
 const REPLACEMENT_WORDS = require('./replacement-words.json');