@lowdefy/connection-smtp 5.3.0 → 6.1.0

package/dist/connections/SMTP/SMTPMailSend/SMTPMailSend.js

@@ -13,17 +13,37 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
+import resolveMailFilter from '../resolveMailFilter.js';
 import send from '../send.js';
 import schema from './schema.js';
-async function SMTPMailSend({ request, connection }) {
+async function SMTPMailSend({ request, connection, environment }) {
     const messages = type.isArray(request) ? request : [
         request
     ];
+    // The current environment can switch email off (config.environments.<env>.email.enabled: false):
+    // nothing is sent, and each message reports it was not.
+    if (environment?.email?.enabled === false) {
+        return {
+            response: 'Mail is disabled in this environment.',
+            results: messages.map(()=>({
+                    messageId: null,
+                    to: null,
+                    disabled: true
+                }))
+        };
+    }
+    const filter = resolveMailFilter({
+        connection,
+        environment
+    });
     const results = [];
     // Send sequentially so a single SMTP connection or pool is not overwhelmed.
     for (const mail of messages){
         results.push(await send({
-            connection,
+            connection: {
+                ...connection,
+                filter
+            },
             mail
         }));
     }

package/dist/connections/SMTP/resolveMailFilter.js

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2026 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import { type } from '@lowdefy/helpers';
+// The connection's own filter wins over the current environment's delivery filter
+// (config.environments.<env>.email.filter) when it sets at least one field. `false` turns
+// filtering off, the environment's too — for mail that must reach the real recipient in every
+// environment. An unset connection filter, or one whose fields all resolve to null (a
+// `_secret` that is not set on this deployment, say), falls back to the environment's, so a
+// missing value can never switch the safety net off.
+function setsAField(filter) {
+    if (!type.isObject(filter)) return false;
+    return [
+        'replaceAddress',
+        'allowlist',
+        'regex'
+    ].some((field)=>!type.isNone(filter[field]));
+}
+function resolveMailFilter({ connection, environment }) {
+    if (connection.filter === false) return null;
+    if (setsAField(connection.filter)) return connection.filter;
+    return environment?.email?.filter ?? null;
+}
+export default resolveMailFilter;

package/dist/connections/SMTP/schema.js

@@ -101,12 +101,18 @@ export default {
             description: 'Default email address replies should be sent to.'
         },
         // null allowed on all filter values because they come from _secret;
-        // unset secrets resolve null - an unset filter field is disabled.
+        // unset secrets resolve null - an unset filter field is disabled. An unset
+        // (null) filter falls back to the current environment's email filter;
+        // false turns filtering off, the environment's too.
         filter: {
             type: [
                 'object',
-                'null'
+                'null',
+                'boolean'
             ],
+            not: {
+                const: true
+            },
             additionalProperties: false,
             properties: {
                 replaceAddress: {

package/dist/connections/SMTP/send.js

@@ -23,6 +23,7 @@ async function send({ connection, mail }) {
     if (filtered === null) {
         return {
             messageId: null,
+            to: null,
             filtered: true
         };
     }
@@ -39,8 +40,11 @@ async function send({ connection, mail }) {
             html: filtered.html,
             attachments: filtered.attachments
         });
+        // Return the post-filter to so callers can record where mail actually went
+        // when a connection filter (replaceAddress/allowlist/regex) rewrites it.
         return {
             messageId: info.messageId,
+            to: filtered.to,
             accepted: info.accepted,
             rejected: info.rejected
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/connection-smtp",
-  "version": "5.3.0",
+  "version": "6.1.0",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -36,12 +36,12 @@
     "dist/*"
   ],
   "dependencies": {
-    "@lowdefy/helpers": "5.3.0",
-    "nodemailer": "9.0.3"
+    "@lowdefy/helpers": "6.1.0",
+    "nodemailer": "9.1.1"
   },
   "devDependencies": {
     "@jest/globals": "28.1.3",
-    "@lowdefy/ajv": "5.3.0",
+    "@lowdefy/ajv": "6.1.0",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.32",
     "@swc/jest": "0.2.39",