@nocobase/plugin-workflow-notification 2.1.0-alpha.13 → 2.1.0-alpha.15

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("react"),require("react-i18next"),require("@nocobase/client"),require("@nocobase/plugin-notification-manager/client"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-workflow-notification",["react","react-i18next","@nocobase/client","@nocobase/plugin-notification-manager/client","@ant-design/icons","@nocobase/plugin-workflow/client"],e):"object"==typeof exports?exports["@nocobase/plugin-workflow-notification"]=e(require("react"),require("react-i18next"),require("@nocobase/client"),require("@nocobase/plugin-notification-manager/client"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client")):t["@nocobase/plugin-workflow-notification"]=e(t.react,t["react-i18next"],t["@nocobase/client"],t["@nocobase/plugin-notification-manager/client"],t["@ant-design/icons"],t["@nocobase/plugin-workflow/client"])}(self,function(t,e,n,o,r,i){return function(){"use strict";var c={375:function(t){t.exports=r},342:function(t){t.exports=n},486:function(t){t.exports=o},990:function(t){t.exports=i},155:function(e){e.exports=t},953:function(t){t.exports=e}},u={};function a(t){var e=u[t];if(void 0!==e)return e.exports;var n=u[t]={exports:{}};return c[t](n,n.exports,a),n.exports}a.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return a.d(e,{a:e}),e},a.d=function(t,e){for(var n in e)a.o(e,n)&&!a.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(t){if("object"==typeof window)return window}}(),a.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},a.r=function(t){"u">typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},a.g.importScripts&&(l=a.g.location+"");var l,f=a.g.document;if(!l&&f&&(f.currentScript&&"SCRIPT"===f.currentScript.tagName.toUpperCase()&&(l=f.currentScript.src),!l)){var s=f.getElementsByTagName("script");if(s.length)for(var p=s.length-1;p>-1&&(!l||!/^http(s?):/.test(l));)l=s[p--].src}if(!l)throw Error("Automatic publicPath is not supported in this browser");a.p=l.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/");var b={},y=window.__nocobase_public_path__||"";if(!y&&window.location&&window.location.pathname){var d=window.location.pathname||"/",h=d.indexOf("/v2/");y=h>=0?d.slice(0,h+1):"/"}return y&&(y=y.replace(/\/v2\/?$/,"/")),y||(y="/"),"/"!==y.charAt(y.length-1)&&(y+="/"),a.p=y+"static/plugins/@nocobase/plugin-workflow-notification/dist/client/",!function(){a.r(b),a.d(b,{default:function(){return _}});var t=a(342),e=a(155),n=a.n(e),o=a(375),r=a(990),i=a(486);a(953);var c="workflow-notification";function u(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function l(t){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function f(t,e){return(f=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function s(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(t){}return(s=function(){return!!t})()}var p=function(){var t=(0,r.useWorkflowVariableOptions)();return n().createElement(i.MessageConfigForm,{variableOptions:t})},y=function(t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");function e(){var t,r,i;if(!(this instanceof e))throw TypeError("Cannot call a class as a function");return r=e,i=arguments,r=l(r),u(t=function(t,e){var n;if(e&&("object"==((n=e)&&"u">typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof e))return e;if(void 0===t)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(this,s()?Reflect.construct(r,i||[],l(this).constructor):r.apply(this,i)),"title",'{{t("Notification", { ns: "'.concat(c,'" })}}')),u(t,"type","notification"),u(t,"group","extended"),u(t,"description",'{{t("Send notification. You can use the variables in the upstream nodes as content and ohter config.", { ns: "'.concat(c,'" })}}')),u(t,"icon",n().createElement(o.NotificationOutlined,null)),u(t,"fieldset",{message:{type:"void","x-component":"LocalProvider"},ignoreFail:{type:"boolean","x-content":'{{t("Ignore failure and continue workflow", { ns: "'.concat(c,'" })}}'),"x-decorator":"FormItem","x-component":"Checkbox"}}),u(t,"components",{LocalProvider:p}),u(t,"testable",!0),t}return e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t),e}(r.Instruction);function d(t,e,n,o,r,i,c){try{var u=t[i](c),a=u.value}catch(t){n(t);return}u.done?e(a):Promise.resolve(a).then(o,r)}function h(t){return function(){var e=this,n=arguments;return new Promise(function(o,r){var i=t.apply(e,n);function c(t){d(i,o,r,c,u,"next",t)}function u(t){d(i,o,r,c,u,"throw",t)}c(void 0)})}}function v(t,e,n){return(v=O()?Reflect.construct:function(t,e,n){var o=[null];o.push.apply(o,e);var r=new(Function.bind.apply(t,o));return n&&w(r,n.prototype),r}).apply(null,arguments)}function g(t){return(g=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function w(t,e){return(w=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function m(t){var e="function"==typeof Map?new Map:void 0;return(m=function(t){if(null===t||-1===Function.toString.call(t).indexOf("[native code]"))return t;if("function"!=typeof t)throw TypeError("Super expression must either be null or a function");if(void 0!==e){if(e.has(t))return e.get(t);e.set(t,n)}function n(){return v(t,arguments,g(this).constructor)}return n.prototype=Object.create(t.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),w(n,t)})(t)}function O(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(t){}return(O=function(){return!!t})()}function x(t,e){var n,o,r,i={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]},c=Object.create(("function"==typeof Iterator?Iterator:Object).prototype),u=Object.defineProperty;return u(c,"next",{value:a(0)}),u(c,"throw",{value:a(1)}),u(c,"return",{value:a(2)}),"function"==typeof Symbol&&u(c,Symbol.iterator,{value:function(){return this}}),c;function a(u){return function(a){var l=[u,a];if(n)throw TypeError("Generator is already executing.");for(;c&&(c=0,l[0]&&(i=0)),i;)try{if(n=1,o&&(r=2&l[0]?o.return:l[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,l[1])).done)return r;switch(o=0,r&&(l=[2&l[0],r.value]),l[0]){case 0:case 1:r=l;break;case 4:return i.label++,{value:l[1],done:!1};case 5:i.label++,o=l[1],l=[0];continue;case 7:l=i.ops.pop(),i.trys.pop();continue;default:if(!(r=(r=i.trys).length>0&&r[r.length-1])&&(6===l[0]||2===l[0])){i=0;continue}if(3===l[0]&&(!r||l[1]>r[0]&&l[1]<r[3])){i.label=l[1];break}if(6===l[0]&&i.label<r[1]){i.label=r[1],r=l;break}if(r&&i.label<r[2]){i.label=r[2],i.ops.push(l);break}r[2]&&i.ops.pop(),i.trys.pop();continue}l=e.call(t,i)}catch(t){l=[6,t],o=0}finally{n=r=0}if(5&l[0])throw l[1];return{value:l[0]?l[1]:void 0,done:!0}}}}var _=function(t){var e;if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");function n(){var t,e;if(!(this instanceof n))throw TypeError("Cannot call a class as a function");return t=n,e=arguments,t=g(t),function(t,e){var n;if(e&&("object"==((n=e)&&"u">typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof e))return e;if(void 0===t)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(this,O()?Reflect.construct(t,e||[],g(this).constructor):t.apply(this,e))}return n.prototype=Object.create(t&&t.prototype,{constructor:{value:n,writable:!0,configurable:!0}}),t&&w(n,t),e=[{key:"afterAdd",value:function(){return h(function(){return x(this,function(t){return[2]})})()}},{key:"beforeLoad",value:function(){return h(function(){return x(this,function(t){return[2]})})()}},{key:"load",value:function(){return h(function(){return x(this,function(t){return this.app.pm.get("workflow").registerInstruction("notification",y),[2]})}).call(this)}}],function(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}(n.prototype,e),n}(m(t.Plugin))}(),b}()});
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("react"),require("react-i18next"),require("@nocobase/client"),require("@nocobase/plugin-notification-manager/client"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-workflow-notification",["react","react-i18next","@nocobase/client","@nocobase/plugin-notification-manager/client","@ant-design/icons","@nocobase/plugin-workflow/client"],e):"object"==typeof exports?exports["@nocobase/plugin-workflow-notification"]=e(require("react"),require("react-i18next"),require("@nocobase/client"),require("@nocobase/plugin-notification-manager/client"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client")):t["@nocobase/plugin-workflow-notification"]=e(t.react,t["react-i18next"],t["@nocobase/client"],t["@nocobase/plugin-notification-manager/client"],t["@ant-design/icons"],t["@nocobase/plugin-workflow/client"])}(self,function(t,e,n,o,r,i){return function(){"use strict";var c={375:function(t){t.exports=r},342:function(t){t.exports=n},486:function(t){t.exports=o},990:function(t){t.exports=i},155:function(e){e.exports=t},953:function(t){t.exports=e}},u={};function a(t){var e=u[t];if(void 0!==e)return e.exports;var n=u[t]={exports:{}};return c[t](n,n.exports,a),n.exports}a.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return a.d(e,{a:e}),e},a.d=function(t,e){for(var n in e)a.o(e,n)&&!a.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(t){if("object"==typeof window)return window}}(),a.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},a.r=function(t){"u">typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},a.g.importScripts&&(l=a.g.location+"");var l,f=a.g.document;if(!l&&f&&(f.currentScript&&"SCRIPT"===f.currentScript.tagName.toUpperCase()&&(l=f.currentScript.src),!l)){var p=f.getElementsByTagName("script");if(p.length)for(var s=p.length-1;s>-1&&(!l||!/^http(s?):/.test(l));)l=p[s--].src}if(!l)throw Error("Automatic publicPath is not supported in this browser");a.p=l.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/");var b={};return!function(){var t="",e="u">typeof document?document.currentScript:null;if(e&&e.src&&(t=e.src.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/")),!t){var n=window.__webpack_public_path__||"";n&&("/"!==n.charAt(n.length-1)&&(n+="/"),t=n+"static/plugins/@nocobase/plugin-workflow-notification/dist/client/")}if(!t){if(!(t=window.__nocobase_public_path__||"")&&window.location&&window.location.pathname){var o=window.location.pathname||"/",r=o.indexOf("/v2/");t=r>=0?o.slice(0,r+1):"/"}t&&(t=t.replace(/\/v2\/?$/,"/")),t||(t="/"),"/"!==t.charAt(t.length-1)&&(t+="/"),t+="static/plugins/@nocobase/plugin-workflow-notification/dist/client/"}a.p=t}(),!function(){a.r(b),a.d(b,{default:function(){return x}});var t=a(342),e=a(155),n=a.n(e),o=a(375),r=a(990),i=a(486);a(953);var c="workflow-notification";function u(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function l(t){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function f(t,e){return(f=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function p(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(t){}return(p=function(){return!!t})()}var s=function(){var t=(0,r.useWorkflowVariableOptions)();return n().createElement(i.MessageConfigForm,{variableOptions:t})},y=function(t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");function e(){var t,r,i;if(!(this instanceof e))throw TypeError("Cannot call a class as a function");return r=e,i=arguments,r=l(r),u(t=function(t,e){var n;if(e&&("object"==((n=e)&&"u">typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof e))return e;if(void 0===t)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(this,p()?Reflect.construct(r,i||[],l(this).constructor):r.apply(this,i)),"title",'{{t("Notification", { ns: "'.concat(c,'" })}}')),u(t,"type","notification"),u(t,"group","extended"),u(t,"description",'{{t("Send notification. You can use the variables in the upstream nodes as content and ohter config.", { ns: "'.concat(c,'" })}}')),u(t,"icon",n().createElement(o.NotificationOutlined,null)),u(t,"fieldset",{message:{type:"void","x-component":"LocalProvider"},ignoreFail:{type:"boolean","x-content":'{{t("Ignore failure and continue workflow", { ns: "'.concat(c,'" })}}'),"x-decorator":"FormItem","x-component":"Checkbox"}}),u(t,"components",{LocalProvider:s}),u(t,"testable",!0),t}return e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t),e}(r.Instruction);function d(t,e,n,o,r,i,c){try{var u=t[i](c),a=u.value}catch(t){n(t);return}u.done?e(a):Promise.resolve(a).then(o,r)}function h(t){return function(){var e=this,n=arguments;return new Promise(function(o,r){var i=t.apply(e,n);function c(t){d(i,o,r,c,u,"next",t)}function u(t){d(i,o,r,c,u,"throw",t)}c(void 0)})}}function v(t,e,n){return(v=O()?Reflect.construct:function(t,e,n){var o=[null];o.push.apply(o,e);var r=new(Function.bind.apply(t,o));return n&&w(r,n.prototype),r}).apply(null,arguments)}function g(t){return(g=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function w(t,e){return(w=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function m(t){var e="function"==typeof Map?new Map:void 0;return(m=function(t){if(null===t||-1===Function.toString.call(t).indexOf("[native code]"))return t;if("function"!=typeof t)throw TypeError("Super expression must either be null or a function");if(void 0!==e){if(e.has(t))return e.get(t);e.set(t,n)}function n(){return v(t,arguments,g(this).constructor)}return n.prototype=Object.create(t.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),w(n,t)})(t)}function O(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(t){}return(O=function(){return!!t})()}function _(t,e){var n,o,r,i={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]},c=Object.create(("function"==typeof Iterator?Iterator:Object).prototype),u=Object.defineProperty;return u(c,"next",{value:a(0)}),u(c,"throw",{value:a(1)}),u(c,"return",{value:a(2)}),"function"==typeof Symbol&&u(c,Symbol.iterator,{value:function(){return this}}),c;function a(u){return function(a){var l=[u,a];if(n)throw TypeError("Generator is already executing.");for(;c&&(c=0,l[0]&&(i=0)),i;)try{if(n=1,o&&(r=2&l[0]?o.return:l[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,l[1])).done)return r;switch(o=0,r&&(l=[2&l[0],r.value]),l[0]){case 0:case 1:r=l;break;case 4:return i.label++,{value:l[1],done:!1};case 5:i.label++,o=l[1],l=[0];continue;case 7:l=i.ops.pop(),i.trys.pop();continue;default:if(!(r=(r=i.trys).length>0&&r[r.length-1])&&(6===l[0]||2===l[0])){i=0;continue}if(3===l[0]&&(!r||l[1]>r[0]&&l[1]<r[3])){i.label=l[1];break}if(6===l[0]&&i.label<r[1]){i.label=r[1],r=l;break}if(r&&i.label<r[2]){i.label=r[2],i.ops.push(l);break}r[2]&&i.ops.pop(),i.trys.pop();continue}l=e.call(t,i)}catch(t){l=[6,t],o=0}finally{n=r=0}if(5&l[0])throw l[1];return{value:l[0]?l[1]:void 0,done:!0}}}}var x=function(t){var e;if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");function n(){var t,e;if(!(this instanceof n))throw TypeError("Cannot call a class as a function");return t=n,e=arguments,t=g(t),function(t,e){var n;if(e&&("object"==((n=e)&&"u">typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof e))return e;if(void 0===t)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(this,O()?Reflect.construct(t,e||[],g(this).constructor):t.apply(this,e))}return n.prototype=Object.create(t&&t.prototype,{constructor:{value:n,writable:!0,configurable:!0}}),t&&w(n,t),e=[{key:"afterAdd",value:function(){return h(function(){return _(this,function(t){return[2]})})()}},{key:"beforeLoad",value:function(){return h(function(){return _(this,function(t){return[2]})})()}},{key:"load",value:function(){return h(function(){return _(this,function(t){return this.app.pm.get("workflow").registerInstruction("notification",y),[2]})}).call(this)}}],function(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}(n.prototype,e),n}(m(t.Plugin))}(),b}()});

package/dist/externalVersion.js

@@ -10,9 +10,9 @@
 module.exports = {
   "react": "18.2.0",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "2.1.0-alpha.13",
-  "@nocobase/plugin-notification-manager": "2.1.0-alpha.13",
-  "@nocobase/client": "2.1.0-alpha.13",
+  "@nocobase/plugin-workflow": "2.1.0-alpha.15",
+  "@nocobase/plugin-notification-manager": "2.1.0-alpha.15",
+  "@nocobase/client": "2.1.0-alpha.15",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-alpha.13"
+  "@nocobase/server": "2.1.0-alpha.15"
 };

package/dist/server/NotificationInstruction.d.ts

@@ -10,7 +10,19 @@ import { Processor, Instruction, FlowNodeModel } from '@nocobase/plugin-workflow
 export default class extends Instruction {
     run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
         status: 1 | -1;
-        result: any;
+        result: {
+            status: "success";
+            triggerFrom: string;
+            channelName: string;
+            receivers: import("@nocobase/plugin-notification-manager").ReceiversOptions;
+            queued: boolean;
+        } | {
+            status: "failure";
+            reason: string;
+            triggerFrom: string;
+            channelName: string;
+            receivers: import("@nocobase/plugin-notification-manager").ReceiversOptions;
+        };
     } | {
         status: 1 | -2;
         result: any;

package/dist/server/NotificationInstruction.js

@@ -53,62 +53,22 @@ class NotificationInstruction_default extends import_plugin_workflow.Instruction
       data: scope
     };
     const notificationServer = this.workflow.pm.get(import_plugin_notification_manager.default);
-    const { workflow } = processor.execution;
-    const sync = this.workflow.isWorkflowSync(workflow);
-    if (sync) {
-      try {
-        const result = await notificationServer.send(sendParams);
-        if (result.status === "success") {
-          return {
-            status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-            result
-          };
-        } else {
-          return {
-            status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
-            result
-          };
-        }
-      } catch (error) {
-        return {
-          status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.ERROR,
-          result: error
-        };
-      }
-    }
-    const { id } = processor.saveJob({
-      status: import_plugin_workflow.JOB_STATUS.PENDING,
-      nodeId: node.id,
-      nodeKey: node.key,
-      upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
-    });
-    await processor.exit();
-    const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
     try {
-      processor.logger.info(`notification (#${node.id}) sent, waiting for response...`);
-      const result = await notificationServer.send(sendParams);
-      if (result.status === "success") {
-        processor.logger.info(`notification (#${node.id}) sent successfully.`);
-        jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
-        jobDone.result = result;
-      } else {
-        processor.logger.info(`notification (#${node.id}) sent failed.`);
-        jobDone.status = ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
-        jobDone.result = result;
-      }
-    } catch (error) {
-      processor.logger.warn(`notification (#${node.id}) sent failed: ${error.message}`);
-      jobDone.status = ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
-      jobDone.result = error;
-    } finally {
-      const job = await this.workflow.app.db.getRepository("jobs").findOne({
-        filterByTk: id
-      });
-      job.set(jobDone);
-      processor.logger.debug(`notification (#${node.id}) sending ended, resume workflow...`);
-      setImmediate(() => {
-        this.workflow.resume(job);
+      processor.logger.info(`notification (#${node.id}) queued for delivery.`);
+      const result = await notificationServer.send({
+        ...sendParams,
+        transaction: processor.mainTransaction
       });
+      return {
+        status: result.status === "success" || ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
+        result
+      };
+    } catch (error) {
+      processor.logger.warn(`notification (#${node.id}) queue failed: ${error.message}`);
+      return {
+        status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.ERROR,
+        result: error
+      };
     }
   }
   async resume(node, job, processor) {
@@ -123,7 +83,7 @@ class NotificationInstruction_default extends import_plugin_workflow.Instruction
     };
     const notificationServer = this.workflow.pm.get(import_plugin_notification_manager.default);
     try {
-      const result = await notificationServer.send(sendParams);
+      const result = await notificationServer.sendNow(sendParams);
       if (result.status === "success") {
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,

package/package.json

@@ -6,7 +6,7 @@
   "description": "Send notification in workflow.",
   "description.ru-RU": "Отправляет уведомления в рамках рабочего процесса.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.15",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -19,6 +19,7 @@
   "peerDependencies": {
     "@nocobase/client": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/plugin-notification-manager": "2.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
@@ -26,5 +27,5 @@
   "keywords": [
     "Workflow"
   ],
-  "gitHead": "2807a8948412d9c235115a31a81a66f7c82dd173"
+  "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
 }