fix: switch from bytes to @forwardemail/bytes to use thousands separa…

…tor and unit separator

app/controllers/web/my-account/update-domain.js

@@ -8,7 +8,7 @@ const punycode = require('node:punycode');
 const RE2 = require('re2');
 const Boom = require('@hapi/boom');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const isSANB = require('is-string-and-not-blank');
 const { boolean } = require('boolean');
 const { isPort } = require('validator');

app/controllers/web/my-account/validate-alias.js

@@ -6,7 +6,7 @@
 const Boom = require('@hapi/boom');
 const RE2 = require('re2');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const isSANB = require('is-string-and-not-blank');
 const slug = require('speakingurl');
 const splitLines = require('split-lines');

app/models/aliases.js

@@ -6,7 +6,7 @@
 const Boom = require('@hapi/boom');
 const RE2 = require('re2');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const captainHook = require('captain-hook');
 const isFQDN = require('is-fqdn');
 const isSANB = require('is-string-and-not-blank');

app/models/domains.js

@@ -13,7 +13,7 @@ const { setTimeout } = require('node:timers/promises');
 const Boom = require('@hapi/boom');
 const RE2 = require('re2');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const cryptoRandomString = require('crypto-random-string');
 const dayjs = require('dayjs-with-plugins');
 const getDmarcRecord = require('mailauth/lib/dmarc/get-dmarc-record');

app/models/emails.js

@@ -11,7 +11,7 @@ const Axe = require('axe');
 const Boom = require('@hapi/boom');
 const SpamScanner = require('spamscanner');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const dayjs = require('dayjs-with-plugins');
 const getStream = require('get-stream');
 const intoStream = require('into-stream');

app/models/logs.js

@@ -12,7 +12,7 @@ const Graceful = require('@ladjs/graceful');
 const Redis = require('@ladjs/redis');
 const _ = require('lodash');
 const ansiHTML = require('ansi-html-community');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const captainHook = require('captain-hook');
 const dayjs = require('dayjs-with-plugins');
 const isFQDN = require('is-fqdn');

app/models/users.js

@@ -5,7 +5,7 @@
 
 const Boom = require('@hapi/boom');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const captainHook = require('captain-hook');
 const countryList = require('country-list');
 const cryptoRandomString = require('crypto-random-string');

config/index.js

@@ -10,7 +10,7 @@ const path = require('node:path');
 const Axe = require('axe');
 const Boom = require('@hapi/boom');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const consolidate = require('@ladjs/consolidate');
 const dayjs = require('dayjs-with-plugins');
 const isSANB = require('is-string-and-not-blank');

config/utilities.js

@@ -12,7 +12,7 @@ const _ = require('lodash');
 const ajc = require('array-join-conjunction');
 const ansiHTML = require('ansi-html-community');
 const arrayJoinConjunction = require('array-join-conjunction');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const capitalize = require('capitalize');
 const dashify = require('dashify');
 const dayjs = require('dayjs-with-plugins');

helpers/imap/on-append.js

@@ -15,7 +15,7 @@
 
 const { Buffer } = require('node:buffer');
 
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const dayjs = require('dayjs-with-plugins');
 const isHTML = require('is-html');
 const mongoose = require('mongoose');

helpers/message-splitter.js

@@ -10,7 +10,7 @@ const { Transform } = require('node:stream');
 // Many thanks to Andris Reissman
 // <https://gist.github.com/andris9/94e73deef71640322c422b27cded5add>
 //
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const { Headers } = require('mailsplit');
 const { Iconv } = require('iconv');
 

helpers/monitor-server.js

@@ -20,7 +20,7 @@ const {
 //   heapdumpOnOOM: false
 // });
 
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const checkDiskSpace = require('check-disk-space').default;
 // const dayjs = require('dayjs-with-plugins');
 const ip = require('ip');

helpers/on-data-mx.js

@@ -7,7 +7,7 @@ const { Buffer } = require('node:buffer');
 
 const SpamScanner = require('spamscanner');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const isSANB = require('is-string-and-not-blank');
 const { SRS } = require('sender-rewriting-scheme');
 const { isEmail } = require('validator');

helpers/on-data.js

@@ -6,7 +6,7 @@
 const { Buffer } = require('node:buffer');
 
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const getStream = require('get-stream');
 const pFilter = require('p-filter');
 const safeStringify = require('fast-safe-stringify');

helpers/parse-payload.js

@@ -12,7 +12,7 @@ const { randomUUID } = require('node:crypto');
 const { Headers, Splitter, Joiner } = require('mailsplit');
 
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const checkDiskSpace = require('check-disk-space').default;
 const dayjs = require('dayjs-with-plugins');
 const getStream = require('get-stream');

helpers/sync-temporary-mailbox.js

@@ -6,7 +6,7 @@
 const { Buffer } = require('node:buffer');
 
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const checkDiskSpace = require('check-disk-space').default;
 const ms = require('ms');
 const pify = require('pify');

helpers/worker.js

@@ -20,7 +20,7 @@ const Redis = require('@ladjs/redis');
 const _ = require('lodash');
 const archiver = require('archiver');
 const archiverZipEncrypted = require('archiver-zip-encrypted');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const checkDiskSpace = require('check-disk-space').default;
 const dashify = require('dashify');
 const getStream = require('get-stream');

imap-server.js

@@ -18,7 +18,7 @@ const os = require('node:os');
 
 const MessageHandler = require('wildduck/lib/message-handler');
 const RateLimiter = require('async-ratelimiter');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const mongoose = require('mongoose');
 const pRetry = require('p-retry');
 const pWaitFor = require('p-wait-for');

jobs/cleanup-sqlite.js

@@ -18,7 +18,7 @@ require('#config/mongoose');
 const Graceful = require('@ladjs/graceful');
 const Redis = require('@ladjs/redis');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const dayjs = require('dayjs-with-plugins');
 const mongoose = require('mongoose');
 const ms = require('ms');

jobs/cleanup-tmp.js

@@ -16,7 +16,7 @@ const { parentPort } = require('node:worker_threads');
 require('#config/mongoose');
 
 const Graceful = require('@ladjs/graceful');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const ip = require('ip');
 const mongoose = require('mongoose');
 const ms = require('ms');

mx-server.js

@@ -5,7 +5,7 @@
 
 const fs = require('node:fs');
 
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const ms = require('ms');
 const pify = require('pify');
 const { SMTPServer } = require('smtp-server');

package.json

@@ -28,6 +28,7 @@
     "@aws-sdk/s3-request-presigner": "3.637.0",
     "@forevolve/bootstrap-dark": "4.0.2",
     "@fortawesome/fontawesome-free": "5.15.4",
+    "@forwardemail/bytes": "4.0.0",
     "@forwardemail/highlight-pug": "1.0.1",
     "@forwardemail/passport-fido2-webauthn": "0.1.0",
     "@forwardemail/uuid-by-string": "5.0.0",
@@ -99,7 +100,6 @@
     "bree": "9.2.4",
     "bson-objectid": "2.0.4",
     "bufferutil": "4.0.8",
-    "bytes": "3.1.2",
     "cabin": "13.2.8",
     "caldav-adapter": "7.0.6",
     "capitalize": "2.0.4",

smtp-server.js

@@ -6,7 +6,7 @@
 const fs = require('node:fs');
 
 const RateLimiter = require('async-ratelimiter');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const ms = require('ms');
 const pify = require('pify');
 const { SMTPServer } = require('smtp-server');

test/imap/index.js

@@ -17,7 +17,7 @@ const { Buffer } = require('node:buffer');
 const { createHash, randomUUID } = require('node:crypto');
 
 const Axe = require('axe');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const dayjs = require('dayjs-with-plugins');
 const getStream = require('get-stream');
 const ip = require('ip');

test/smtp/index.js

@@ -11,7 +11,7 @@ const API = require('@ladjs/api');
 const Client = require('nodemailer/lib/smtp-connection');
 const Redis = require('ioredis-mock');
 const _ = require('lodash');
-const bytes = require('bytes');
+const bytes = require('@forwardemail/bytes');
 const dayjs = require('dayjs-with-plugins');
 const ip = require('ip');
 const ms = require('ms');