@nocobase/plugin-workflow 0.8.0-alpha.9 → 0.8.1-alpha.3

package/lib/server/instructions/index.d.ts

@@ -7,9 +7,10 @@ export declare type Job = {
     [key: string]: unknown;
 } | null;
 export declare type InstructionResult = Job | Promise<Job>;
+export declare type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
 export interface Instruction {
-    run(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
-    resume?(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
+    run: Runner;
+    resume?: Runner;
 }
 declare type InstructionConstructor<T> = {
     new (p: Plugin): T;

package/lib/server/instructions/index.js

@@ -47,7 +47,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _default(plugin, more = {}) {
   const instructions = plugin.instructions;
-  const natives = ['calculation', 'condition', 'parallel', 'delay', 'prompt', 'query', 'create', 'update', 'destroy'].reduce((result, key) => Object.assign(result, {
+  const natives = ['calculation', 'condition', 'parallel', 'delay', 'prompt', 'query', 'create', 'update', 'destroy', 'request'].reduce((result, key) => Object.assign(result, {
     [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
 

package/lib/server/instructions/prompt.js

@@ -86,7 +86,8 @@ class _default {
               actionName = _context$action.actionName,
               resourceName = _context$action.resourceName;
 
-        if (actionName === 'submit' && resourceName === 'jobs' && _this.middlewares.length) {
+        if (actionName === 'submit' && resourceName === 'jobs' // && this.middlewares.length
+        ) {
           return (0, _koaCompose().default)([loadJob, ..._this.middlewares])(context, next);
         }
 

package/lib/server/instructions/query.js

@@ -28,7 +28,9 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield (multiple ? repo.find : repo.findOne).call(repo, _objectSpread(_objectSpread({}, options), {}, {
-        context: processor.options._context,
+        context: {
+          executionId: processor.execution.id
+        },
         transaction: processor.transaction
       })); // NOTE: `toJSON()` to avoid getting undefined value from Proxied model instance (#380)
       // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false

package/lib/server/instructions/request.d.ts

@@ -0,0 +1,14 @@
+import { AxiosRequestConfig } from 'axios';
+import { Instruction } from './index';
+export interface Header {
+    name: string;
+    value: any;
+}
+export declare type RequestConfig = Pick<AxiosRequestConfig, 'url' | 'method' | 'data' | 'timeout'> & {
+    headers: Array<Header>;
+    ignoreFail: boolean;
+};
+export default class implements Instruction {
+    run(node: any, input: any, processor: any): Promise<any>;
+    resume(node: any, job: any, processor: any): Promise<any>;
+}

package/lib/server/instructions/request.js

@@ -0,0 +1,154 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _constants = require("../constants");
+
+function _ejs() {
+  const data = require("ejs");
+
+  _ejs = function _ejs() {
+    return data;
+  };
+
+  return data;
+}
+
+function _axios() {
+  const data = _interopRequireDefault(require("axios"));
+
+  _axios = function _axios() {
+    return data;
+  };
+
+  return data;
+}
+
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+
+  _lodash = function _lodash() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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);
+}
+
+function triggerResume(_x3, _x4, _x5, _x6) {
+  return _triggerResume.apply(this, arguments);
+}
+
+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);
+}
+
+class _default {
+  run(node, input, processor) {
+    return _asyncToGenerator(function* () {
+      const templateVars = {
+        node: processor.jobsMapByNodeId,
+        ctx: 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$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}`);
+      }
+
+      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}`);
+      }
+
+      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);
+      });
+
+      return job;
+    })();
+  }
+
+  resume(node, job, processor) {
+    return _asyncToGenerator(function* () {
+      const ignoreFail = node.config.ignoreFail;
+
+      if (ignoreFail) {
+        job.set('status', _constants.JOB_STATUS.RESOLVED);
+      }
+
+      return job;
+    })();
+  }
+
+}
+
+exports.default = _default;

package/lib/server/instructions/update.d.ts

@@ -2,7 +2,7 @@ import FlowNodeModel from "../models/FlowNode";
 import Processor from "../Processor";
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
-        result: import("@nocobase/database").Model<any, any> | import("@nocobase/database").Model<any, any>[];
+        result: any;
         status: number;
     }>;
 };

package/lib/server/instructions/update.js

@@ -29,7 +29,9 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield repo.update(_objectSpread(_objectSpread({}, options), {}, {
-        context: processor.options._context,
+        context: {
+          executionId: processor.execution.id
+        },
         transaction: processor.transaction
       }));
       return {

package/lib/server/migrations/20221129153547-calculation-variables.d.ts

@@ -0,0 +1,5 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/lib/server/migrations/20221129153547-calculation-variables.js

@@ -0,0 +1,116 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _server() {
+  const data = require("@nocobase/server");
+
+  _server = function _server() {
+    return data;
+  };
+
+  return data;
+}
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const VTypes = {
+  constant(operand) {
+    return operand.value;
+  },
+
+  $jobsMapByNodeId({
+    options
+  }) {
+    const paths = [options.nodeId, options.path].filter(Boolean);
+    return paths ? `{{$jobsMapByNodeId.${paths.join('.')}}}` : null;
+  },
+
+  $context({
+    options
+  }) {
+    return `{{$context.${options.path}}}`;
+  }
+
+};
+
+function migrateConfig(config) {
+  if (Array.isArray(config)) {
+    return config.map(item => migrateConfig(item));
+  }
+
+  if (typeof config !== 'object') {
+    return config;
+  }
+
+  if (!config) {
+    return config;
+  }
+
+  if (config.type && VTypes[config.type] && (config.options || config.value)) {
+    return VTypes[config.type](config);
+  }
+
+  return Object.keys(config).reduce((memo, key) => _objectSpread(_objectSpread({}, memo), {}, {
+    [key]: migrateConfig(config[key])
+  }), {});
+}
+
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const match = yield _this.app.version.satisfies('<=0.8.0-alpha.13');
+
+      if (!match) {
+        return;
+      }
+
+      const NodeRepo = _this.context.db.getRepository('flow_nodes');
+
+      yield _this.context.db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          const nodes = yield NodeRepo.find({
+            filter: {
+              type: {
+                $or: ['calculation', 'condition']
+              }
+            },
+            transaction
+          });
+          console.log('%d nodes need to be migrated.', nodes.length);
+          yield nodes.reduce((promise, node) => {
+            return node.update({
+              config: migrateConfig(node.config)
+            }, {
+              transaction
+            });
+          }, Promise.resolve());
+        });
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+
+  down() {
+    return _asyncToGenerator(function* () {})();
+  }
+
+}
+
+exports.default = _default;

package/lib/server/triggers/collection.js

@@ -62,10 +62,11 @@ function _handler() {
           collectionName = _workflow$config3.collection,
           condition = _workflow$config3.condition,
           changed = _workflow$config3.changed;
-    const collection = data.constructor.database.getCollection(collectionName); // NOTE: if no configured fields changed, do not trigger
+    const collection = data.constructor.database.getCollection(collectionName);
+    const transaction = options.transaction,
+          context = options.context; // NOTE: if no configured fields changed, do not trigger
 
     if (changed && changed.length && changed.filter(name => !['linkTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collection.getField(name).type)).every(name => !data.changedWithAssociations(getFieldRawName(collection, name)))) {
-      // TODO: temp comment out
       return;
     } // NOTE: if no configured condition match, do not trigger
 
@@ -75,8 +76,6 @@ function _handler() {
       // const calculation = toCalculation(condition);
       const repository = collection.repository,
             model = collection.model;
-      const transaction = options.transaction,
-            context = options.context;
       const count = yield repository.count({
         filter: {
           $and: [condition, {
@@ -92,11 +91,10 @@ function _handler() {
       }
     }
 
-    return this.plugin.trigger(workflow, {
+    this.plugin.trigger(workflow, {
       data: data.get()
     }, {
-      context: options.context,
-      transaction: options.transaction
+      context
     });
   });
   return _handler.apply(this, arguments);

package/lib/server/triggers/schedule.js

@@ -218,7 +218,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
         const startTime = getDataOptionTime(data, startsOn);
         const endTime = getDataOptionTime(data, endsOn, -1);
 
-        if (!startTime && !repeat) {
+        if (!startTime) {
           return;
         }
 
@@ -457,7 +457,9 @@ class ScheduleTrigger extends _.Trigger {
     this.cacheCycle = 60000;
 
     this.run = () => {
-      const now = new Date();
+      const now = new Date(); // 1001 to avoid 999
+
+      const nextInterval = 1001 - now.getMilliseconds();
       now.setMilliseconds(0); // NOTE: trigger `onTick` for high interval jobs which are cached in last 1 min
 
       this.onTick(now); // NOTE: reload when second match cache cycle
@@ -465,6 +467,8 @@ class ScheduleTrigger extends _.Trigger {
       if (!(now.getTime() % this.cacheCycle)) {
         this.reload();
       }
+
+      this.timer = setTimeout(this.run, nextInterval);
     };
 
     plugin.app.on('beforeStop', () => {
@@ -481,10 +485,7 @@ class ScheduleTrigger extends _.Trigger {
 
     const now = new Date(); // NOTE: assign to this.timer to avoid duplicated initialization
 
-    this.timer = setTimeout(() => {
-      this.timer = setInterval(this.run, this.interval); // initially trigger
-      // this.onTick(now);
-    }, // NOTE:
+    this.timer = setTimeout(this.run, // NOTE:
     //  try to align to system time on each second starts,
     //  after at least 1 second initialized for anything to get ready.
     //  so jobs in 2 seconds will be missed at first start.
@@ -629,6 +630,11 @@ class ScheduleTrigger extends _.Trigger {
     return _asyncToGenerator(function* () {
       const mode = workflow.config.mode;
       const modeHandlers = ScheduleModes.get(mode);
+
+      if (!modeHandlers) {
+        return;
+      }
+
       return modeHandlers.trigger.call(_this8, workflow, date);
     })();
   }
@@ -666,6 +672,11 @@ ScheduleTrigger.CacheRules = [({
 }) => (config.limit ? allExecuted < config.limit : true) && config.startsOn, matchNext, function (workflow, now) {
   const mode = workflow.config.mode;
   const modeHandlers = ScheduleModes.get(mode);
+
+  if (!modeHandlers) {
+    return false;
+  }
+
   return modeHandlers.shouldCache.call(this, workflow, now);
 }];
 ScheduleTrigger.TriggerRules = [({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.8.0-alpha.9",
+  "version": "0.8.1-alpha.3",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,18 +10,23 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.8.0-alpha.9",
-    "@nocobase/client": "0.8.0-alpha.9",
-    "@nocobase/database": "0.8.0-alpha.9",
-    "@nocobase/server": "0.8.0-alpha.9",
-    "@nocobase/utils": "0.8.0-alpha.9",
+    "@nocobase/actions": "0.8.1-alpha.3",
+    "@nocobase/client": "0.8.1-alpha.3",
+    "@nocobase/database": "0.8.1-alpha.3",
+    "@nocobase/server": "0.8.1-alpha.3",
+    "@nocobase/utils": "0.8.1-alpha.3",
+    "antd": "4.22.8",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
+    "ejs": "^3.1.8",
     "json-templates": "^4.2.0",
+    "moment": "^2.29.2",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.8.0-alpha.9"
+    "@nocobase/test": "0.8.1-alpha.3",
+    "@types/ejs": "^3.1.1"
   },
-  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }