emailengine-app 2.69.0 → 2.71.0

package/server.js

@@ -107,29 +107,9 @@ const bounceClassifier = require('@postalsys/bounce-classifier');
 
 const v8 = require('node:v8');
 
-// Initialize Bugsnag error tracking if API key is provided
-const Bugsnag = require('@bugsnag/js');
-if (readEnvValue('BUGSNAG_API_KEY')) {
-    Bugsnag.start({
-        apiKey: readEnvValue('BUGSNAG_API_KEY'),
-        appVersion: packageData.version,
-        logger: {
-            debug(...args) {
-                logger.debug({ msg: args.shift(), worker: 'main', source: 'bugsnag', args: args.length ? args : undefined });
-            },
-            info(...args) {
-                logger.debug({ msg: args.shift(), worker: 'main', source: 'bugsnag', args: args.length ? args : undefined });
-            },
-            warn(...args) {
-                logger.warn({ msg: args.shift(), worker: 'main', source: 'bugsnag', args: args.length ? args : undefined });
-            },
-            error(...args) {
-                logger.error({ msg: args.shift(), worker: 'main', source: 'bugsnag', args: args.length ? args : undefined });
-            }
-        }
-    });
-    logger.notifyError = Bugsnag.notify.bind(Bugsnag);
-}
+// Initialize Sentry error tracking if a DSN is provided
+const { initSentry } = require('./lib/sentry');
+initSentry('main');
 
 // Import additional dependencies
 const pathlib = require('path');
@@ -141,6 +121,8 @@ const { compare: cv } = require('compare-versions');
 const Joi = require('joi');
 const { settingsSchema } = require('./lib/schemas');
 const settings = require('./lib/settings');
+const { documentStoreFeatureEnabled } = require('./lib/document-store');
+const { attachBeacon, persistBeaconMarkers } = require('./lib/license-beacon');
 const tokens = require('./lib/tokens');
 
 const { checkRateLimit } = require('./lib/rate-limit');
@@ -263,6 +245,9 @@ const API_PROXY = hasEnvValue('EENGINE_API_PROXY') ? getBoolean(readEnvValue('EE
 // API authentication requirement configuration (default: true)
 const REQUIRE_API_AUTH = hasEnvValue('EENGINE_REQUIRE_API_AUTH') ? getBoolean(readEnvValue('EENGINE_REQUIRE_API_AUTH')) : null;
 
+// Opt-out for the license-validation feature beacon (telemetry rides on the existing license call)
+const BEACON_DISABLED = hasEnvValue('EENGINE_BEACON_DISABLED') ? getBoolean(readEnvValue('EENGINE_BEACON_DISABLED')) : false;
+
 // OAuth2 token access configuration
 const ENABLE_OAUTH_TOKENS_API = hasEnvValue('EENGINE_ENABLE_OAUTH_TOKENS_API') ? getBoolean(readEnvValue('EENGINE_ENABLE_OAUTH_TOKENS_API')) : null;
 
@@ -1877,6 +1862,21 @@ let licenseCheckHandler = async opts => {
             (await redis.hUpdateBigger(`${REDIS_PREFIX}settings`, 'subcheck', now - subscriptionCheckTimeout, now))
         ) {
             try {
+                let body = {
+                    key: licenseInfo.details.key,
+                    version: packageData.version,
+                    app: '@postalsys/emailengine-app',
+                    instance: (await settings.get('serviceId')) || ''
+                };
+
+                // Best-effort feature beacon: enrich the existing call with a compact, anonymized
+                // feature snapshot. Time-boxed and fully isolated (attachBeacon never throws) so it
+                // can never block, delay, or alter license validation. The full snapshot is only sent
+                // when its digest changes or once every 30 days; otherwise just the digest rides along.
+                if (!BEACON_DISABLED) {
+                    await attachBeacon(body, { redis, logger, now });
+                }
+
                 // Call license validation API
                 let res = await fetchCmd(`https://postalsys.com/licenses/validate`, {
                     method: 'post',
@@ -1884,12 +1884,7 @@ let licenseCheckHandler = async opts => {
                         'User-Agent': `${packageData.name}/${packageData.version} (+${packageData.homepage})`,
                         'Content-Type': 'application/json'
                     },
-                    body: JSON.stringify({
-                        key: licenseInfo.details.key,
-                        version: packageData.version,
-                        app: '@postalsys/emailengine-app',
-                        instance: (await settings.get('serviceId')) || ''
-                    }),
+                    body: JSON.stringify(body),
                     dispatcher: httpAgent.retry
                 });
 
@@ -1921,6 +1916,11 @@ let licenseCheckHandler = async opts => {
                         let nextCheck = Math.min(now + MAX_LICENSE_CHECK_DELAY, validatedUntil.getTime());
                         await redis.hset(`${REDIS_PREFIX}settings`, 'ks', new Date(nextCheck).getTime().toString(16));
                     }
+
+                    // Persist beacon markers so the full snapshot is only resent when it changes.
+                    if (!BEACON_DISABLED) {
+                        await persistBeaconMarkers({ redis, logger, body, now, needFull: data.needFull });
+                    }
                 }
             } catch (err) {
                 logger.error({ msg: 'License validation error', err });
@@ -1970,6 +1970,11 @@ let licenseCheckHandler = async opts => {
                         }
                 }
             }
+
+            // Workers were respawned after license activation. Assign any accounts that
+            // accumulated in the unassigned set while workers were suspended, as the
+            // worker ready handler only reassigns after crashes (reassignmentPending)
+            assignAccounts().catch(err => logger.error({ msg: 'Unable to assign accounts after license activation', err }));
         }
     } finally {
         checkingLicense = false;
@@ -3433,8 +3438,10 @@ const startApplication = async () => {
         await spawnWorker('export');
     }
 
-    // Start document processing worker
-    await spawnWorker('documents');
+    // Start document processing worker (deprecated Document Store feature; only when enabled)
+    if (documentStoreFeatureEnabled) {
+        await spawnWorker('documents');
+    }
 
     // Start SMTP proxy if enabled
     if (await settings.get('smtpServerEnabled')) {