@nocobase/plugin-workflow 0.17.0-alpha.7 → 0.18.0-alpha.8

package/dist/server/Processor.js

@@ -41,7 +41,6 @@ class Processor {
     [import_constants.JOB_STATUS.RETRY_NEEDED]: import_constants.EXECUTION_STATUS.RETRY_NEEDED
   };
   logger;
-  transaction;
   nodes = [];
   nodesMap = /* @__PURE__ */ new Map();
   jobsMap = /* @__PURE__ */ new Map();
@@ -68,33 +67,22 @@ class Processor {
       this.jobsMapByNodeKey[node.key] = job.result;
     });
   }
-  async getTransaction() {
-    var _a;
-    if (!((_a = this.execution.workflow.options) == null ? void 0 : _a.useTransaction)) {
-      return;
-    }
-    const { options } = this;
-    return options.transaction && !options.transaction.finished ? options.transaction : await options.plugin.db.sequelize.transaction();
-  }
   async prepare() {
     const { execution } = this;
     if (!execution.workflow) {
       execution.workflow = await execution.getWorkflow();
     }
-    const transaction = await this.getTransaction();
-    this.transaction = transaction;
     const nodes = await execution.workflow.getNodes();
     this.makeNodes(nodes);
     const jobs = await execution.getJobs({
-      order: [["id", "ASC"]],
-      transaction
+      order: [["id", "ASC"]]
     });
     this.makeJobs(jobs);
   }
   async start() {
     const { execution } = this;
     if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
-      throw new Error(`execution was ended with status ${execution.status}`);
+      throw new Error(`execution was ended with status ${execution.status} before, could not be started again`);
     }
     await this.prepare();
     if (this.nodes.length) {
@@ -107,17 +95,12 @@ class Processor {
   async resume(job) {
     const { execution } = this;
     if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
-      throw new Error(`execution was ended with status ${execution.status}`);
+      throw new Error(`execution was ended with status ${execution.status} before, could not be resumed`);
     }
     await this.prepare();
     const node = this.nodesMap.get(job.nodeId);
     await this.recall(node, job);
   }
-  async commit() {
-    if (this.transaction && (!this.options.transaction || this.options.transaction.finished)) {
-      await this.transaction.commit();
-    }
-  }
   async exec(instruction, node, prevJob) {
     let job;
     try {
@@ -188,10 +171,9 @@ class Processor {
   async exit(s) {
     if (typeof s === "number") {
       const status = this.constructor.StatusMap[s] ?? Math.sign(s);
-      await this.execution.update({ status }, { transaction: this.transaction });
+      await this.execution.update({ status });
     }
     this.logger.info(`execution (${this.execution.id}) exiting with status ${this.execution.status}`);
-    await this.commit();
     return null;
   }
   // TODO(optimize)
@@ -200,22 +182,15 @@ class Processor {
     const { model } = database.getCollection("jobs");
     let job;
     if (payload instanceof model) {
-      job = await payload.save({ transaction: this.transaction });
+      job = await payload.save();
     } else if (payload.id) {
       job = await model.findByPk(payload.id);
-      await job.update(payload, {
-        transaction: this.transaction
-      });
+      await job.update(payload);
     } else {
-      job = await model.create(
-        {
-          ...payload,
-          executionId: this.execution.id
-        },
-        {
-          transaction: this.transaction
-        }
-      );
+      job = await model.create({
+        ...payload,
+        executionId: this.execution.id
+      });
     }
     this.jobsMap.set(job.id, job);
     const node = this.nodesMap.get(job.nodeId);

package/dist/server/actions/workflows.js

@@ -36,6 +36,7 @@ __export(workflows_exports, {
 module.exports = __toCommonJS(workflows_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
 var import_database = require("@nocobase/database");
+var import_Plugin = __toESM(require("../Plugin"));
 async function update(context, next) {
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, values } = context.action.params;
@@ -80,11 +81,10 @@ async function destroy(context, next) {
   next();
 }
 async function revision(context, next) {
-  const plugin = context.app.getPlugin("workflow");
-  const { db } = context;
+  const plugin = context.app.getPlugin(import_Plugin.default);
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, filter = {}, values = {} } = context.action.params;
-  context.body = await db.sequelize.transaction(async (transaction) => {
+  context.body = await context.db.sequelize.transaction(async (transaction) => {
     const origin = await repository.findOne({
       filterByTk,
       filter,
@@ -146,7 +146,7 @@ async function revision(context, next) {
   await next();
 }
 async function sync(context, next) {
-  const plugin = context.app.getPlugin("workflow");
+  const plugin = context.app.getPlugin(import_Plugin.default);
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, filter = {} } = context.action.params;
   const workflows = await repository.find({

package/dist/server/collections/executions.js

@@ -33,11 +33,6 @@ var executions_default = {
       type: "uid",
       name: "key"
     },
-    {
-      type: "boolean",
-      name: "useTransaction",
-      defaultValue: false
-    },
     {
       type: "hasMany",
       name: "jobs",

package/dist/server/collections/workflows.js

@@ -55,11 +55,6 @@ function workflows_default() {
         required: true,
         defaultValue: {}
       },
-      {
-        type: "boolean",
-        name: "useTransaction"
-        // defaultValue: true,
-      },
       {
         type: "hasMany",
         name: "nodes",

package/dist/server/constants.d.ts

@@ -1,26 +1,21 @@
 export declare const EXECUTION_STATUS: {
-    QUEUEING: any;
-    STARTED: number;
-    RESOLVED: number;
-    FAILED: number;
-    ERROR: number;
-    ABORTED: number;
-    CANCELED: number;
-    REJECTED: number;
-    RETRY_NEEDED: number;
+    readonly QUEUEING: any;
+    readonly STARTED: 0;
+    readonly RESOLVED: 1;
+    readonly FAILED: -1;
+    readonly ERROR: -2;
+    readonly ABORTED: -3;
+    readonly CANCELED: -4;
+    readonly REJECTED: -5;
+    readonly RETRY_NEEDED: -6;
 };
 export declare const JOB_STATUS: {
-    PENDING: number;
-    RESOLVED: number;
-    FAILED: number;
-    ERROR: number;
-    ABORTED: number;
-    CANCELED: number;
-    REJECTED: number;
-    RETRY_NEEDED: number;
-};
-export declare const BRANCH_INDEX: {
-    DEFAULT: any;
-    ON_TRUE: number;
-    ON_FALSE: number;
+    readonly PENDING: 0;
+    readonly RESOLVED: 1;
+    readonly FAILED: -1;
+    readonly ERROR: -2;
+    readonly ABORTED: -3;
+    readonly CANCELED: -4;
+    readonly REJECTED: -5;
+    readonly RETRY_NEEDED: -6;
 };

package/dist/server/constants.js

@@ -17,7 +17,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constants_exports = {};
 __export(constants_exports, {
-  BRANCH_INDEX: () => BRANCH_INDEX,
   EXECUTION_STATUS: () => EXECUTION_STATUS,
   JOB_STATUS: () => JOB_STATUS
 });
@@ -43,14 +42,8 @@ const JOB_STATUS = {
   REJECTED: -5,
   RETRY_NEEDED: -6
 };
-const BRANCH_INDEX = {
-  DEFAULT: null,
-  ON_TRUE: 1,
-  ON_FALSE: 0
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BRANCH_INDEX,
   EXECUTION_STATUS,
   JOB_STATUS
 });

package/dist/server/instructions/CalculationInstruction.d.ts

@@ -2,14 +2,16 @@ import { Instruction } from '.';
 import type Processor from '../Processor';
 import type { FlowNodeModel } from '../types';
 export interface CalculationConfig {
-    dynamic?: boolean | string;
     engine?: string;
     expression?: string;
 }
 export declare class CalculationInstruction extends Instruction {
     run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
         result: any;
-        status: number;
+        status: 1;
+    } | {
+        result: any;
+        status: -2;
     }>;
 }
 export default CalculationInstruction;

package/dist/server/instructions/CalculationInstruction.js

@@ -22,20 +22,12 @@ __export(CalculationInstruction_exports, {
 });
 module.exports = __toCommonJS(CalculationInstruction_exports);
 var import_evaluators = require("@nocobase/evaluators");
-var import_utils = require("@nocobase/utils");
 var import__ = require(".");
 var import_constants = require("../constants");
 class CalculationInstruction extends import__.Instruction {
   async run(node, prevJob, processor) {
-    const { dynamic = false } = node.config || {};
-    let { engine = "math.js", expression = "" } = node.config;
-    let scope = processor.getScope(node.id);
-    if (dynamic) {
-      const parsed = (0, import_utils.parse)(dynamic)(scope) ?? {};
-      engine = parsed.engine;
-      expression = parsed.expression;
-      scope = (0, import_utils.parse)(node.config.scope ?? "")(scope) ?? {};
-    }
+    const { engine = "math.js", expression = "" } = node.config;
+    const scope = processor.getScope(node.id);
     const evaluator = import_evaluators.evaluators.get(engine);
     try {
       const result = evaluator && expression ? evaluator(expression, scope) : null;

package/dist/server/instructions/ConditionInstruction.d.ts

@@ -3,16 +3,24 @@ import { Instruction } from '.';
 import type Processor from '../Processor';
 import type { FlowNodeModel, JobModel } from '../types';
 type Comparer = (a: any, b: any) => boolean;
+export declare const BRANCH_INDEX: {
+    readonly DEFAULT: any;
+    readonly ON_TRUE: 1;
+    readonly ON_FALSE: 0;
+};
 export declare const calculators: Registry<Comparer>;
 export declare class ConditionInstruction extends Instruction {
     run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
-        status: number;
+        status: 1;
         result: boolean;
         nodeId: number;
         upstreamId: any;
     } | {
         result: any;
-        status: number;
+        status: -2;
+    } | {
+        status: -1;
+        result: boolean;
     }>;
     resume(node: FlowNodeModel, branchJob: JobModel, processor: Processor): Promise<any>;
 }

package/dist/server/instructions/ConditionInstruction.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ConditionInstruction_exports = {};
 __export(ConditionInstruction_exports, {
+  BRANCH_INDEX: () => BRANCH_INDEX,
   ConditionInstruction: () => ConditionInstruction,
   calculators: () => calculators,
   default: () => ConditionInstruction_default
@@ -26,6 +27,11 @@ var import_evaluators = require("@nocobase/evaluators");
 var import_utils = require("@nocobase/utils");
 var import__ = require(".");
 var import_constants = require("../constants");
+const BRANCH_INDEX = {
+  DEFAULT: null,
+  ON_TRUE: 1,
+  ON_FALSE: 0
+};
 const calculators = new import_utils.Registry();
 function equal(a, b) {
   return a == b;
@@ -145,6 +151,7 @@ class ConditionInstruction extends import__.Instruction {
 var ConditionInstruction_default = ConditionInstruction;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  BRANCH_INDEX,
   ConditionInstruction,
   calculators
 });

package/dist/server/instructions/CreateInstruction.d.ts

@@ -4,7 +4,7 @@ import { Instruction } from '.';
 export declare class CreateInstruction extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: object;
-        status: number;
+        status: 1;
     }>;
 }
 export default CreateInstruction;

package/dist/server/instructions/CreateInstruction.js

@@ -33,8 +33,8 @@ class CreateInstruction extends import__.Instruction {
       ...options,
       context: {
         executionId: processor.execution.id
-      },
-      transaction: processor.transaction
+      }
+      // transaction: processor.transaction,
     });
     let result = created;
     if (created && appends.length) {
@@ -45,8 +45,8 @@ class CreateInstruction extends import__.Instruction {
       }, /* @__PURE__ */ new Set());
       result = await repository.findOne({
         filterByTk: created[model.primaryKeyAttribute],
-        appends: Array.from(includeFields),
-        transaction: processor.transaction
+        appends: Array.from(includeFields)
+        // transaction: processor.transaction,
       });
     }
     return {

package/dist/server/instructions/DestroyInstruction.d.ts

@@ -4,7 +4,7 @@ import type { FlowNodeModel } from '../types';
 export declare class DestroyInstruction extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;
-        status: number;
+        status: 1;
     }>;
 }
 export default DestroyInstruction;

package/dist/server/instructions/DestroyInstruction.js

@@ -32,8 +32,8 @@ class DestroyInstruction extends import__.Instruction {
       ...options,
       context: {
         executionId: processor.execution.id
-      },
-      transaction: processor.transaction
+      }
+      // transaction: processor.transaction,
     });
     return {
       result,

package/dist/server/instructions/QueryInstruction.d.ts

@@ -4,7 +4,10 @@ import { Instruction } from '.';
 export declare class QueryInstruction extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;
-        status: number;
+        status: -1;
+    } | {
+        result: object;
+        status: 1;
     }>;
 }
 export default QueryInstruction;

package/dist/server/instructions/QueryInstruction.js

@@ -49,8 +49,8 @@ class QueryInstruction extends import__.Instruction {
         var _a;
         return `${((_a = item.direction) == null ? void 0 : _a.toLowerCase()) === "desc" ? "-" : ""}${item.field}`;
       }),
-      appends,
-      transaction: processor.transaction
+      appends
+      // transaction: processor.transaction,
     });
     if (failOnEmpty && (multiple ? !result.length : !result)) {
       return {

package/dist/server/instructions/UpdateInstruction.d.ts

@@ -4,7 +4,7 @@ import { Instruction } from '.';
 export declare class UpdateInstruction extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;
-        status: number;
+        status: 1;
     }>;
 }
 export default UpdateInstruction;

package/dist/server/instructions/UpdateInstruction.js

@@ -32,8 +32,8 @@ class UpdateInstruction extends import__.Instruction {
       ...options,
       context: {
         executionId: processor.execution.id
-      },
-      transaction: processor.transaction
+      }
+      // transaction: processor.transaction,
     });
     return {
       result: result.length ?? result,

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

@@ -9,12 +9,15 @@ export interface IJob {
 }
 export type InstructionResult = IJob | Promise<IJob> | null;
 export type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
-export declare abstract class Instruction {
-    plugin: Plugin;
-    constructor(plugin: Plugin);
+export type InstructionInterface = {
+    run: Runner;
+    resume?: Runner;
+    getScope?: (node: FlowNodeModel, data: any, processor: Processor) => any;
+    duplicateConfig?: (node: FlowNodeModel, options: Transactionable) => object | Promise<object>;
+};
+export declare abstract class Instruction implements InstructionInterface {
+    workflow: Plugin;
+    constructor(workflow: Plugin);
     abstract run(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
-    resume?(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
-    getScope?(node: FlowNodeModel, data: any, processor: Processor): any;
-    duplicateConfig?(node: FlowNodeModel, options: Transactionable): object | Promise<object>;
 }
 export default Instruction;

package/dist/server/instructions/index.js

@@ -22,8 +22,8 @@ __export(instructions_exports, {
 });
 module.exports = __toCommonJS(instructions_exports);
 class Instruction {
-  constructor(plugin) {
-    this.plugin = plugin;
+  constructor(workflow) {
+    this.workflow = workflow;
   }
 }
 var instructions_default = Instruction;

package/dist/server/migrations/20230612021134-manual-collection-block.js

@@ -113,6 +113,7 @@ class manual_collection_block_default extends import_server.Migration {
     }
     const { db } = this.context;
     const NodeRepo = db.getRepository("flow_nodes");
+    await NodeRepo.collection.sync();
     await db.sequelize.transaction(async (transaction) => {
       const nodes = await NodeRepo.find({
         filter: {

package/dist/server/triggers/CollectionTrigger.js

@@ -86,7 +86,7 @@ async function handler(workflow, data, options) {
     });
   }
   const json = (0, import_utils.toJSON)(result);
-  this.plugin.trigger(
+  this.workflow.trigger(
     workflow,
     { data: json },
     {
@@ -97,7 +97,7 @@ async function handler(workflow, data, options) {
 class CollectionTrigger extends import__.default {
   events = /* @__PURE__ */ new Map();
   on(workflow) {
-    const { db } = this.plugin.app;
+    const { db } = this.workflow.app;
     const { collection, mode } = workflow.config;
     const Collection2 = db.getCollection(collection);
     if (!Collection2) {
@@ -122,7 +122,7 @@ class CollectionTrigger extends import__.default {
     }
   }
   off(workflow) {
-    const { db } = this.plugin.app;
+    const { db } = this.workflow.app;
     const { collection, mode } = workflow.config;
     const Collection2 = db.getCollection(collection);
     if (!Collection2) {

package/dist/server/triggers/ScheduleTrigger.d.ts

@@ -25,7 +25,7 @@ export default class ScheduleTrigger extends Trigger {
     private cache;
     interval: number;
     cacheCycle: number;
-    constructor(plugin: Plugin);
+    constructor(workflow: Plugin);
     init(): void;
     run: () => void;
     onTick(now: any): Promise<any>;

package/dist/server/triggers/ScheduleTrigger.js

@@ -94,7 +94,7 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
         return 0;
       }
     }
-    this.plugin.trigger(workflow, { date: now });
+    this.workflow.trigger(workflow, { date: now });
     return 1;
   }
 });
@@ -178,7 +178,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
       this.setCache(workflow);
     };
     this.events.set(name, listener);
-    this.plugin.app.db.on(event, listener);
+    this.workflow.app.db.on(event, listener);
   },
   off(workflow) {
     const { collection } = workflow.config;
@@ -187,11 +187,11 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     if (this.events.has(name)) {
       const listener = this.events.get(name);
       this.events.delete(name);
-      this.plugin.app.db.off(event, listener);
+      this.workflow.app.db.off(event, listener);
     }
   },
   async shouldCache(workflow, now) {
-    const { db } = this.plugin.app;
+    const { db } = this.workflow.app;
     const { startsOn, endsOn, repeat, collection } = workflow.config;
     const timestamp = now.getTime();
     const startTimestamp = getOnTimestampWithOffset(startsOn, now);
@@ -265,7 +265,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
           [import_database.Op.lt]: new Date(startTimestamp)
         }
       });
-      const tsFn = DialectTimestampFnMap[this.plugin.app.db.options.dialect];
+      const tsFn = DialectTimestampFnMap[this.workflow.app.db.options.dialect];
       if (typeof repeat === "number" && tsFn) {
         const modExp = (0, import_database.fn)(
           "MOD",
@@ -298,7 +298,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
         }
       });
     }
-    const repo = this.plugin.app.db.getRepository(collection);
+    const repo = this.workflow.app.db.getRepository(collection);
     const instances = await repo.find({
       where: {
         [import_database.Op.and]: conditions
@@ -309,7 +309,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
       } : {}
     });
     instances.forEach((item) => {
-      this.plugin.trigger(workflow, {
+      this.workflow.trigger(workflow, {
         date: now,
         data: item.toJSON()
       });
@@ -358,9 +358,9 @@ class ScheduleTrigger extends import__.default {
   interval = 1e3;
   // caching workflows in range, default to 1min
   cacheCycle = 6e4;
-  constructor(plugin) {
-    super(plugin);
-    plugin.app.on("beforeStop", () => {
+  constructor(workflow) {
+    super(workflow);
+    workflow.app.on("beforeStop", () => {
       if (this.timer) {
         clearInterval(this.timer);
       }
@@ -368,7 +368,7 @@ class ScheduleTrigger extends import__.default {
   }
   init() {
     var _a;
-    if (((_a = this.plugin.app.getPlugin("multi-app-share-collection")) == null ? void 0 : _a.enabled) && this.plugin.app.name !== "main") {
+    if (((_a = this.workflow.app.getPlugin("multi-app-share-collection")) == null ? void 0 : _a.enabled) && this.workflow.app.name !== "main") {
       return;
     }
     if (this.timer) {
@@ -395,7 +395,7 @@ class ScheduleTrigger extends import__.default {
     this.timer = setTimeout(this.run, nextInterval);
   };
   async onTick(now) {
-    const isSqlite = this.plugin.app.db.options.dialect === "sqlite";
+    const isSqlite = this.workflow.app.db.options.dialect === "sqlite";
     return Array.from(this.cache.values()).reduce(
       (prev, workflow) => {
         if (!this.shouldTrigger(workflow, now)) {
@@ -411,7 +411,7 @@ class ScheduleTrigger extends import__.default {
     );
   }
   async reload() {
-    const WorkflowRepo = this.plugin.app.db.getRepository("workflows");
+    const WorkflowRepo = this.workflow.app.db.getRepository("workflows");
     const workflows = await WorkflowRepo.find({
       filter: { enabled: true, type: "schedule" }
     });
@@ -424,7 +424,7 @@ class ScheduleTrigger extends import__.default {
     workflows.forEach(async (workflow) => {
       const should = await this.shouldCache(workflow, now);
       if (should) {
-        this.plugin.getLogger(workflow.id).info("caching scheduled workflow will run in next minute");
+        this.workflow.getLogger(workflow.id).info("caching scheduled workflow will run in next minute");
       }
       this.setCache(workflow, !should);
     });

package/dist/server/triggers/index.d.ts

@@ -2,8 +2,8 @@ import { Transactionable } from '@nocobase/database';
 import type Plugin from '../Plugin';
 import type { WorkflowModel } from '../types';
 export declare abstract class Trigger {
-    readonly plugin: Plugin;
-    constructor(plugin: Plugin);
+    readonly workflow: Plugin;
+    constructor(workflow: Plugin);
     abstract on(workflow: WorkflowModel): void;
     abstract off(workflow: WorkflowModel): void;
     duplicateConfig?(workflow: WorkflowModel, options: Transactionable): object | Promise<object>;

package/dist/server/triggers/index.js

@@ -22,8 +22,8 @@ __export(triggers_exports, {
 });
 module.exports = __toCommonJS(triggers_exports);
 class Trigger {
-  constructor(plugin) {
-    this.plugin = plugin;
+  constructor(workflow) {
+    this.workflow = workflow;
   }
 }
 var triggers_default = Trigger;

package/dist/server/types/Execution.d.ts

@@ -7,8 +7,6 @@ export default class ExecutionModel extends Model {
     title: string;
     context: any;
     status: number;
-    useTransaction: boolean;
-    transaction: string;
     createdAt: Date;
     updatedAt: Date;
     key: string;

package/dist/server/types/Workflow.d.ts

@@ -11,7 +11,6 @@ export default class WorkflowModel extends Model {
     description?: string;
     type: string;
     config: any;
-    useTransaction: boolean;
     executed: number;
     createdAt: Date;
     updatedAt: Date;