@nocobase/plugin-workflow-mailer 2.1.0-beta.37 → 2.1.0-beta.38

package/dist/externalVersion.js

@@ -11,9 +11,9 @@ module.exports = {
   "@ant-design/icons": "5.6.1",
   "@formily/antd-v5": "1.2.3",
   "react": "18.2.0",
-  "@nocobase/client": "2.1.0-beta.37",
-  "@nocobase/plugin-workflow": "2.1.0-beta.37",
+  "@nocobase/client": "2.1.0-beta.38",
+  "@nocobase/plugin-workflow": "2.1.0-beta.38",
   "react-i18next": "11.18.6",
   "lodash": "4.18.1",
-  "@nocobase/server": "2.1.0-beta.37"
+  "@nocobase/server": "2.1.0-beta.38"
 };

package/dist/node_modules/joi/package.json

@@ -1 +1 @@
-{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-05-26T00:46:20.438Z"}
+{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-05-29T02:54:07.786Z"}

package/dist/node_modules/nodemailer/package.json

@@ -1 +1 @@
-{"name":"nodemailer","version":"6.9.13","description":"Easy as cake e-mail sending from your Node.js applications","main":"lib/nodemailer.js","scripts":{"test":"node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","test:coverage":"c8 node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","lint":"eslint .","update":"rm -rf node_modules/ package-lock.json && ncu -u && npm install"},"repository":{"type":"git","url":"https://github.com/nodemailer/nodemailer.git"},"keywords":["Nodemailer"],"author":"Andris Reinman","license":"MIT-0","bugs":{"url":"https://github.com/nodemailer/nodemailer/issues"},"homepage":"https://nodemailer.com/","devDependencies":{"@aws-sdk/client-ses":"3.529.1","bunyan":"1.8.15","c8":"9.1.0","eslint":"8.57.0","eslint-config-nodemailer":"1.2.0","eslint-config-prettier":"9.1.0","libbase64":"1.3.0","libmime":"5.3.4","libqp":"2.1.0","nodemailer-ntlm-auth":"1.0.4","proxy":"1.0.2","proxy-test-server":"1.0.0","smtp-server":"3.13.3"},"engines":{"node":">=6.0.0"},"_lastModified":"2026-05-26T00:46:21.172Z"}
+{"name":"nodemailer","version":"6.9.13","description":"Easy as cake e-mail sending from your Node.js applications","main":"lib/nodemailer.js","scripts":{"test":"node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","test:coverage":"c8 node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","lint":"eslint .","update":"rm -rf node_modules/ package-lock.json && ncu -u && npm install"},"repository":{"type":"git","url":"https://github.com/nodemailer/nodemailer.git"},"keywords":["Nodemailer"],"author":"Andris Reinman","license":"MIT-0","bugs":{"url":"https://github.com/nodemailer/nodemailer/issues"},"homepage":"https://nodemailer.com/","devDependencies":{"@aws-sdk/client-ses":"3.529.1","bunyan":"1.8.15","c8":"9.1.0","eslint":"8.57.0","eslint-config-nodemailer":"1.2.0","eslint-config-prettier":"9.1.0","libbase64":"1.3.0","libmime":"5.3.4","libqp":"2.1.0","nodemailer-ntlm-auth":"1.0.4","proxy":"1.0.2","proxy-test-server":"1.0.0","smtp-server":"3.13.3"},"engines":{"node":">=6.0.0"},"_lastModified":"2026-05-29T02:54:08.453Z"}

package/dist/server/MailerInstruction.d.ts

@@ -7,18 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import Joi from 'joi';
-import { FlowNodeModel, Instruction, Processor } from '@nocobase/plugin-workflow';
+import { FlowNodeModel, Instruction, InstructionResult, JobModel, Processor } from '@nocobase/plugin-workflow';
 export default class MailerInstruction extends Instruction {
     configSchema: Joi.ObjectSchema<any>;
-    private static transporterMap;
-    private static configMap;
-    private getTransporterKey;
-    private isConfigChanged;
-    private createNewTransporter;
-    private getTransporter;
-    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
-        status: 1 | -1;
-        result: any;
-    }>;
-    resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
+    run(node: FlowNodeModel, prevJob: JobModel, processor: Processor, options?: {
+        signal?: AbortSignal;
+    }): Promise<InstructionResult>;
+    resume(node: FlowNodeModel, job: JobModel, processor: Processor): Promise<JobModel>;
 }

package/dist/server/MailerInstruction.js

@@ -40,10 +40,127 @@ __export(MailerInstruction_exports, {
 });
 module.exports = __toCommonJS(MailerInstruction_exports);
 var import_joi = __toESM(require("joi"));
-var import_util = require("util");
 var import_nodemailer = __toESM(require("nodemailer"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 var import_get = __toESM(require("lodash/get"));
+const transporterMap = /* @__PURE__ */ new Map();
+const configMap = /* @__PURE__ */ new Map();
+function getTransporterKey(provider) {
+  const { host, port, auth } = provider;
+  return `${host}:${port}:${auth == null ? void 0 : auth.user}`;
+}
+function isConfigChanged(oldConfig, newConfig) {
+  const fields = ["host", "port", "secure", "auth.user", "auth.pass"];
+  return fields.some((key) => (0, import_get.default)(oldConfig, key) !== (0, import_get.default)(newConfig, key));
+}
+function createNewTransporter(key, config) {
+  const transporter = import_nodemailer.default.createTransport(config);
+  transporterMap.set(key, transporter);
+  configMap.set(key, config);
+  return transporter;
+}
+function getTransporter(provider) {
+  const key = getTransporterKey(provider);
+  const newConfig = provider;
+  const oldConfig = configMap.get(key);
+  if (!oldConfig) {
+    return createNewTransporter(key, newConfig);
+  }
+  if (isConfigChanged(oldConfig, newConfig)) {
+    const oldTransporter = transporterMap.get(key);
+    if (oldTransporter) {
+      oldTransporter.close();
+    }
+    return createNewTransporter(key, newConfig);
+  }
+  return transporterMap.get(key);
+}
+function discardTransporter(key, transporter) {
+  transporter.close();
+  if (transporterMap.get(key) === transporter) {
+    transporterMap.delete(key);
+    configMap.delete(key);
+  }
+}
+function createAbortSignal(processor, signal, timeout = 0) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const abortController = new AbortController();
+  let timeoutTimer = null;
+  let abortListener = null;
+  const abort = (reason) => {
+    if (abortController.signal.aborted) {
+      return;
+    }
+    abortController.abort(reason instanceof Error ? reason : new import_plugin_workflow.WorkflowTimeoutError());
+  };
+  if (signal == null ? void 0 : signal.aborted) {
+    abort(signal.reason);
+  } else {
+    abortListener = () => abort(signal == null ? void 0 : signal.reason);
+    signal == null ? void 0 : signal.addEventListener("abort", abortListener, { once: true });
+  }
+  const executionWorkflow = processor.execution.workflow ?? ((_b = (_a = processor.execution).get) == null ? void 0 : _b.call(_a, "workflow"));
+  const executionWorkflowOptions = (executionWorkflow == null ? void 0 : executionWorkflow.options) ?? ((_c = executionWorkflow == null ? void 0 : executionWorkflow.get) == null ? void 0 : _c.call(executionWorkflow, "options")) ?? {};
+  const workflowTimeout = Number(timeout || executionWorkflowOptions.timeout || 0);
+  const expiresAt = processor.execution.expiresAt ?? ((_e = (_d = processor.execution).get) == null ? void 0 : _e.call(_d, "expiresAt"));
+  const startedAt = processor.execution.startedAt ?? ((_g = (_f = processor.execution).get) == null ? void 0 : _g.call(_f, "startedAt"));
+  const remaining = expiresAt ? new Date(expiresAt).getTime() - Date.now() : workflowTimeout > 0 && startedAt ? new Date(startedAt).getTime() + workflowTimeout - Date.now() : workflowTimeout > 0 ? workflowTimeout : null;
+  if (remaining != null) {
+    if (remaining <= 0) {
+      abort(new import_plugin_workflow.WorkflowTimeoutError());
+    } else {
+      timeoutTimer = setTimeout(() => abort(new import_plugin_workflow.WorkflowTimeoutError()), remaining);
+    }
+  }
+  return {
+    signal: abortController.signal,
+    cleanup: () => {
+      if (timeoutTimer) {
+        clearTimeout(timeoutTimer);
+      }
+      if (signal && abortListener) {
+        signal.removeEventListener("abort", abortListener);
+      }
+    }
+  };
+}
+function sendMail(transporter, transporterKey, payload, signal) {
+  if (signal == null ? void 0 : signal.aborted) {
+    discardTransporter(transporterKey, transporter);
+    return Promise.reject(signal.reason);
+  }
+  return new Promise((resolve, reject) => {
+    let finished = false;
+    const cleanup = () => {
+      signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+    };
+    const done = (error, result) => {
+      if (finished) {
+        return;
+      }
+      finished = true;
+      cleanup();
+      if (error) {
+        reject(error);
+      } else {
+        resolve(result);
+      }
+    };
+    const onAbort = () => {
+      if (finished) {
+        return;
+      }
+      discardTransporter(transporterKey, transporter);
+      done((signal == null ? void 0 : signal.reason) instanceof Error ? signal.reason : new import_plugin_workflow.WorkflowTimeoutError());
+    };
+    signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+    try {
+      transporter.sendMail(payload, done);
+    } catch (error) {
+      done(error);
+    }
+  });
+}
 class MailerInstruction extends import_plugin_workflow.Instruction {
   configSchema = import_joi.default.object({
     provider: import_joi.default.object({
@@ -65,39 +182,8 @@ class MailerInstruction extends import_plugin_workflow.Instruction {
     text: import_joi.default.string(),
     ignoreFail: import_joi.default.boolean().default(false)
   });
-  static transporterMap = /* @__PURE__ */ new Map();
-  static configMap = /* @__PURE__ */ new Map();
-  getTransporterKey(provider) {
-    const { host, port, auth } = provider;
-    return `${host}:${port}:${auth == null ? void 0 : auth.user}`;
-  }
-  isConfigChanged(oldConfig, newConfig) {
-    const fields = ["host", "port", "secure", "auth.user", "auth.pass"];
-    return fields.some((key) => (0, import_get.default)(oldConfig, key) !== (0, import_get.default)(newConfig, key));
-  }
-  createNewTransporter(key, config) {
-    const transporter = import_nodemailer.default.createTransport(config);
-    MailerInstruction.transporterMap.set(key, transporter);
-    MailerInstruction.configMap.set(key, config);
-    return transporter;
-  }
-  getTransporter(provider) {
-    const key = this.getTransporterKey(provider);
-    const newConfig = provider;
-    const oldConfig = MailerInstruction.configMap.get(key);
-    if (!oldConfig) {
-      return this.createNewTransporter(key, newConfig);
-    }
-    if (this.isConfigChanged(oldConfig, newConfig)) {
-      const oldTransporter = MailerInstruction.transporterMap.get(key);
-      if (oldTransporter) {
-        oldTransporter.close();
-      }
-      return this.createNewTransporter(key, newConfig);
-    }
-    return MailerInstruction.transporterMap.get(key);
-  }
-  async run(node, prevJob, processor) {
+  async run(node, prevJob, processor, options) {
+    var _a, _b;
     const {
       provider,
       contentType,
@@ -108,32 +194,41 @@ class MailerInstruction extends import_plugin_workflow.Instruction {
       html,
       text,
       ignoreFail,
-      ...options
+      ...others
     } = processor.getParsedValue(node.config, node.id);
     const { workflow } = processor.execution;
-    const sync = this.workflow.isWorkflowSync(workflow);
-    const transporter = this.getTransporter(provider);
-    const send = (0, import_util.promisify)(transporter.sendMail.bind(transporter));
+    const currentWorkflow = (workflow == null ? void 0 : workflow.options) || ((_a = workflow == null ? void 0 : workflow.get) == null ? void 0 : _a.call(workflow, "options")) ? workflow : await node.getWorkflow();
+    const sync = this.workflow.isWorkflowSync(currentWorkflow);
+    const workflowOptions = (currentWorkflow == null ? void 0 : currentWorkflow.options) ?? ((_b = currentWorkflow == null ? void 0 : currentWorkflow.get) == null ? void 0 : _b.call(currentWorkflow, "options")) ?? {};
+    const workflowTimeout = Number(workflowOptions.timeout ?? 0);
+    const transporterKey = getTransporterKey(provider);
+    const transporter = getTransporter(provider);
+    const mailAbort = createAbortSignal(processor, options == null ? void 0 : options.signal, workflowTimeout);
     const payload = {
-      ...options,
+      ...others,
       ...contentType === "html" ? { html } : { text },
       subject: subject == null ? void 0 : subject.trim(),
       to: to ? to.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : void 0,
-      cc: cc ? cc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : null,
-      bcc: bcc ? bcc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : null
+      cc: cc ? cc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : [],
+      bcc: bcc ? bcc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : []
     };
     if (sync) {
       try {
-        const result = await send(payload);
+        const result = await sendMail(transporter, transporterKey, payload, mailAbort.signal);
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,
           result
         };
       } catch (error) {
+        if (mailAbort.signal.aborted) {
+          throw error;
+        }
         return {
           status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
           result: error
         };
+      } finally {
+        mailAbort.cleanup();
       }
     }
     const { id } = processor.saveJob({
@@ -145,26 +240,40 @@ class MailerInstruction extends import_plugin_workflow.Instruction {
     await processor.exit();
     const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
     try {
-      const response = await send(payload);
+      const response = await sendMail(transporter, transporterKey, payload, mailAbort.signal);
       processor.logger.info(`smtp-mailer (#${node.id}) sent successfully.`);
       jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
       jobDone.result = response;
     } catch (error) {
       processor.logger.warn(`smtp-mailer (#${node.id}) sent failed: ${error.message}`);
-      jobDone.status = import_plugin_workflow.JOB_STATUS.FAILED;
+      jobDone.status = mailAbort.signal.aborted ? import_plugin_workflow.JOB_STATUS.ABORTED : import_plugin_workflow.JOB_STATUS.FAILED;
       jobDone.result = error;
     } finally {
+      mailAbort.cleanup();
       processor.logger.debug(`smtp-mailer (#${node.id}) sending ended, resume workflow...`);
       const job = await this.workflow.app.db.getRepository("jobs").findOne({
         filterByTk: id
       });
-      job.set(jobDone);
-      this.workflow.resume(job);
+      const execution = await job.getExecution();
+      const aborted = await this.workflow.abortExecutionIfExpired(execution);
+      if (!aborted) {
+        await execution.reload();
+        await job.reload();
+      }
+      if (!aborted && execution.status === import_plugin_workflow.EXECUTION_STATUS.STARTED && job.status === import_plugin_workflow.JOB_STATUS.PENDING) {
+        job.set(jobDone);
+        job.execution = execution;
+        this.workflow.resume(job);
+      } else {
+        processor.logger.warn(
+          `smtp-mailer (#${node.id}) result discarded because execution (${execution.id}) is ended`
+        );
+      }
     }
   }
   async resume(node, job, processor) {
     const { ignoreFail } = node.config;
-    if (ignoreFail) {
+    if (ignoreFail && job.status !== import_plugin_workflow.JOB_STATUS.ABORTED) {
       job.set("status", import_plugin_workflow.JOB_STATUS.RESOLVED);
     }
     return job;

package/package.json

@@ -6,7 +6,7 @@
   "description": "Send email in workflow.",
   "description.ru-RU": "Отправляет электронное письмо в рамках рабочего процесса.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "2.1.0-beta.37",
+  "version": "2.1.0-beta.38",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -25,7 +25,7 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae",
+  "gitHead": "d1c585108ff6e51c17b0b52bacb1a2d621d9c119",
   "keywords": [
     "NocoBase",
     "Workflow",