@nocobase/plugin-workflow 0.8.1-alpha.4 → 0.9.0-alpha.2

package/lib/server/instructions/request.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _constants = require("../constants");
-
 function _ejs() {
   const data = require("ejs");
 
@@ -27,15 +25,7 @@ function _axios() {
   return data;
 }
 
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
-
-  _lodash = function _lodash() {
-    return data;
-  };
-
-  return data;
-}
+var _constants = require("../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -43,96 +33,91 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function renderData(_x, _x2) {
-  return _renderData.apply(this, arguments);
-}
-
-function _renderData() {
-  _renderData = _asyncToGenerator(function* (templateStr, vars) {
-    if (_lodash().default.isEmpty(templateStr)) {
-      return '';
-    }
-
-    return (0, _ejs().render)(templateStr, vars, {
-      async: true
-    });
-  });
-  return _renderData.apply(this, arguments);
-}
+class _default {
+  constructor(plugin) {
+    var _this = this;
+
+    this.plugin = void 0;
+
+    this.request = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (node, job, processor) {
+        const templateVars = {
+          node: processor.jobsMapByNodeId,
+          ctx: processor.execution.context,
+          $jobsMapByNodeId: processor.jobsMapByNodeId,
+          $context: processor.execution.context
+        };
+        const requestConfig = node.config; // default headers
+
+        const headers = {
+          'Content-Type': 'application/json'
+        };
+        const _requestConfig$header = requestConfig.headers,
+              headerArr = _requestConfig$header === void 0 ? [] : _requestConfig$header,
+              _requestConfig$method = requestConfig.method,
+              method = _requestConfig$method === void 0 ? 'POST' : _requestConfig$method,
+              _requestConfig$timeou = requestConfig.timeout,
+              timeout = _requestConfig$timeou === void 0 ? 5000 : _requestConfig$timeou;
+        headerArr.forEach(header => headers[header.name] = header.value);
+        let url, data;
+
+        try {
+          url = yield (0, _ejs().render)(requestConfig.url.trim(), templateVars, {
+            async: true
+          });
+          data = requestConfig.data ? yield (0, _ejs().render)(requestConfig.data.trim(), templateVars, {
+            async: true
+          }) : undefined;
+        } catch (error2) {
+          // console.error(error2);
+          job.set({
+            status: _constants.JOB_STATUS.REJECTED,
+            result: error2.message
+          });
+        }
 
-function triggerResume(_x3, _x4, _x5, _x6) {
-  return _triggerResume.apply(this, arguments);
-}
+        try {
+          const response = yield _axios().default.request({
+            url,
+            method,
+            headers,
+            data,
+            timeout
+          });
+          job.set({
+            status: _constants.JOB_STATUS.RESOLVED,
+            result: response.data
+          });
+        } catch (error1) {
+          // console.error('axios error?', error1);
+          job.set({
+            status: _constants.JOB_STATUS.REJECTED,
+            result: error1.isAxiosError ? error1.toJSON() : error1.message
+          });
+        }
 
-function _triggerResume() {
-  _triggerResume = _asyncToGenerator(function* (plugin, job, status, result) {
-    job.set('status', status);
-    job.set('result', result);
-    return plugin.resume(job);
-  });
-  return _triggerResume.apply(this, arguments);
-}
+        return _this.plugin.resume(job);
+      });
 
-class _default {
-  run(node, input, processor) {
-    return _asyncToGenerator(function* () {
-      const templateVars = {
-        node: processor.jobsMapByNodeId,
-        ctx: processor.execution.context
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
       };
-      const requestConfig = node.config; // default headers
+    }();
 
-      const headers = {
-        'Content-Type': 'application/json'
-      };
-      const _requestConfig$header = requestConfig.headers,
-            headerArr = _requestConfig$header === void 0 ? [] : _requestConfig$header,
-            _requestConfig$ignore = requestConfig.ignoreFail,
-            ignoreFail = _requestConfig$ignore === void 0 ? false : _requestConfig$ignore,
-            _requestConfig$method = requestConfig.method,
-            method = _requestConfig$method === void 0 ? 'POST' : _requestConfig$method,
-            _requestConfig$timeou = requestConfig.timeout,
-            timeout = _requestConfig$timeou === void 0 ? 5000 : _requestConfig$timeou;
-      headerArr.forEach(header => headers[header.name] = header.value);
-      let url, data;
-
-      try {
-        url = yield renderData(requestConfig.url, templateVars);
-      } catch (e) {
-        console.warn(e);
-        throw new Error(`ejs can't render url, please check url format！${e === null || e === void 0 ? void 0 : e.message}`);
-      }
+    this.plugin = plugin;
+  }
 
-      try {
-        data = yield renderData(requestConfig.data, templateVars);
-      } catch (e) {
-        console.warn(e);
-        throw new Error(`ejs can't render request data, please check request data format！${e === null || e === void 0 ? void 0 : e.message}`);
-      }
+  run(node, input, processor) {
+    var _this2 = this;
 
+    return _asyncToGenerator(function* () {
       const job = yield processor.saveJob({
         status: _constants.JOB_STATUS.PENDING,
         nodeId: node.id
       });
-      const plugin = processor.options.plugin;
-
-      _axios().default.request({
-        method,
-        timeout,
-        headers,
-        url,
-        data
-      }).then(resp => {
-        if (resp.status >= 200 && resp.status < 300) {
-          triggerResume(plugin, job, _constants.JOB_STATUS.RESOLVED, resp.data);
-        } else {
-          triggerResume(plugin, job, _constants.JOB_STATUS.REJECTED, resp);
-        }
-      }).catch(e => {
-        console.warn(e);
-        triggerResume(plugin, job, _constants.JOB_STATUS.REJECTED, e === null || e === void 0 ? void 0 : e.message);
+      setTimeout(() => {
+        _this2.request(node, job, processor);
       });
-
       return job;
     })();
   }

package/package.json

@@ -1,21 +1,18 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.8.1-alpha.4",
-  "main": "lib/index.js",
-  "license": "Apache-2.0",
-  "licenses": [
-    {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
-    }
-  ],
+  "version": "0.9.0-alpha.2",
+  "description": "",
+  "license": "AGPL-3.0",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.8.1-alpha.4",
-    "@nocobase/client": "0.8.1-alpha.4",
-    "@nocobase/database": "0.8.1-alpha.4",
-    "@nocobase/server": "0.8.1-alpha.4",
-    "@nocobase/utils": "0.8.1-alpha.4",
+    "@nocobase/actions": "0.9.0-alpha.2",
+    "@nocobase/client": "0.9.0-alpha.2",
+    "@nocobase/database": "0.9.0-alpha.2",
+    "@nocobase/server": "0.9.0-alpha.2",
+    "@nocobase/utils": "0.9.0-alpha.2",
     "antd": "4.22.8",
+    "axios": "^0.27.2",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
     "ejs": "^3.1.8",
@@ -25,8 +22,8 @@
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.8.1-alpha.4",
+    "@nocobase/test": "0.9.0-alpha.2",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "22ccdf7bd7fcbd16aeefd5250db237a4bd1ccff1"
+  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
 }