@nocobase/plugin-workflow 0.18.0-alpha.1 → 0.18.0-alpha.9

package/dist/client/nodes/calculation.d.ts

@@ -58,9 +58,14 @@ export default class extends Instruction {
         title: any;
     }, { types, fieldNames }: {
         types: any;
-        fieldNames?: import("@nocobase/client").FieldNames;
+        fieldNames?: {
+            readonly label: "label";
+            readonly value: "value";
+            readonly children: "children";
+        };
     }): {
-        [x: string]: any;
+        value: any;
+        label: any;
     };
     useInitializers(node: any): SchemaInitializerItemType;
 }

package/dist/client/nodes/index.d.ts

@@ -1,7 +1,12 @@
 import { ISchema } from '@formily/react';
 import React from 'react';
 import { SchemaInitializerItemType } from '@nocobase/client';
-import { VariableOption, VariableOptions } from '../variable';
+import { UseVariableOptions, VariableOption } from '../variable';
+export type NodeAvailableContext = {
+    workflow: object;
+    upstream: object;
+    branchIndex: number;
+};
 export declare abstract class Instruction {
     title: string;
     type: string;
@@ -23,14 +28,14 @@ export declare abstract class Instruction {
         [key: string]: any;
     };
     Component?(props: any): JSX.Element;
-    useVariables?(node: any, options?: any): VariableOption;
-    useScopeVariables?(node: any, options?: any): VariableOptions;
+    useVariables?(node: any, options?: UseVariableOptions): VariableOption;
+    useScopeVariables?(node: any, options?: any): VariableOption[];
     useInitializers?(node: any): SchemaInitializerItemType | null;
-    isAvailable?(ctx: object): boolean;
+    isAvailable?(ctx: NodeAvailableContext): boolean;
 }
 export declare const NodeContext: React.Context<any>;
 export declare function useNodeContext(): any;
-export declare function useAvailableUpstreams(node: any): any[];
+export declare function useAvailableUpstreams(node: any, filter?: any): any[];
 export declare function useUpstreamScopes(node: any): any[];
 export declare function Node({ data }: {
     data: any;

package/dist/client/triggers/collection.d.ts

@@ -3,7 +3,6 @@ import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/cl
 import { Trigger } from '.';
 export default class extends Trigger {
     title: string;
-    type: string;
     description: string;
     fieldset: {
         collection: {

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

@@ -1,12 +1,11 @@
 import React from 'react';
 import { ISchema } from '@formily/react';
 import { SchemaInitializerItemType } from '@nocobase/client';
-import { VariableOptions } from '../variable';
+import { UseVariableOptions, VariableOption } from '../variable';
 export declare abstract class Trigger {
     title: string;
-    type: string;
     description?: string;
-    useVariables?(config: any, options?: any): VariableOptions;
+    useVariables?(config: Record<string, any>, options?: UseVariableOptions): VariableOption[];
     fieldset: {
         [key: string]: ISchema;
     };

package/dist/client/triggers/schedule/index.d.ts

@@ -3,7 +3,6 @@ import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/cl
 import { Trigger } from '..';
 export default class extends Trigger {
     title: string;
-    type: string;
     description: string;
     fieldset: {
         config: {

package/dist/client/variable.d.ts

@@ -3,18 +3,18 @@ export type VariableOption = {
     key?: string;
     value?: string;
     label?: string;
-    children?: VariableOptions;
+    children?: VariableOption[] | null;
     [key: string]: any;
 };
-export type VariableOptions = VariableOption[] | null;
-export type VariableDataType = string | {
-    type: string;
-    options?: {
+export type VariableDataType = 'boolean' | 'number' | 'string' | 'date' | {
+    type: 'reference';
+    options: {
+        collection: string;
+        multiple?: boolean;
         entity?: boolean;
-        collection?: string;
     };
-} | ((field: any, appends?: string[]) => boolean);
-export type OptionsOfUseVariableOptions = {
+} | ((field: any) => boolean);
+export type UseVariableOptions = {
     types?: VariableDataType[];
     fieldNames?: {
         label?: string;
@@ -23,7 +23,6 @@ export type OptionsOfUseVariableOptions = {
     };
     appends?: string[] | null;
     depth?: number;
-    current?: any;
 };
 export declare const defaultFieldNames: {
     readonly label: "label";
@@ -33,22 +32,24 @@ export declare const defaultFieldNames: {
 export declare const nodesOptions: {
     label: string;
     value: string;
-    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
+    useOptions(options: UseVariableOptions): VariableOption[];
 };
 export declare const triggerOptions: {
     label: string;
     value: string;
-    useOptions(options: OptionsOfUseVariableOptions): any;
+    useOptions(options: UseVariableOptions): any;
 };
 export declare const scopeOptions: {
     label: string;
     value: string;
-    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
+    useOptions(options: UseVariableOptions & {
+        current: any;
+    }): VariableOption[];
 };
 export declare const systemOptions: {
     label: string;
     value: string;
-    useOptions({ types, fieldNames }: OptionsOfUseVariableOptions): {
+    useOptions({ types, fieldNames }: UseVariableOptions): {
         [x: string]: string;
         key: string;
     }[];
@@ -59,7 +60,7 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function useWorkflowVariableOptions(options?: OptionsOfUseVariableOptions): {
+export declare function useWorkflowVariableOptions(options?: UseVariableOptions): {
     [x: number]: any;
     key: any;
     disabled: boolean;

package/dist/externalVersion.js

@@ -2,20 +2,21 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.12.2",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/client": "0.18.0-alpha.1",
+  "@nocobase/client": "0.18.0-alpha.9",
   "react-router-dom": "6.21.0",
-  "@nocobase/utils": "0.18.0-alpha.1",
+  "@nocobase/utils": "0.18.0-alpha.9",
   "react-i18next": "11.18.6",
-  "winston": "3.11.0",
-  "@nocobase/database": "0.18.0-alpha.1",
-  "@nocobase/server": "0.18.0-alpha.1",
-  "@nocobase/logger": "0.18.0-alpha.1",
-  "@nocobase/evaluators": "0.18.0-alpha.1",
+  "@nocobase/database": "0.18.0-alpha.9",
+  "@nocobase/server": "0.18.0-alpha.9",
+  "@nocobase/logger": "0.18.0-alpha.9",
+  "@nocobase/evaluators": "0.18.0-alpha.9",
   "@formily/react": "2.3.0",
   "@formily/core": "2.3.0",
   "lodash": "4.17.21",
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/actions": "0.18.0-alpha.1",
+  "@nocobase/actions": "0.18.0-alpha.9",
   "sequelize": "6.35.2",
+  "@nocobase/plugin-workflow-test": "0.18.0-alpha.9",
+  "@nocobase/test": "0.18.0-alpha.9",
   "dayjs": "1.11.10"
 };

package/dist/locale/en-US.json

@@ -58,7 +58,7 @@
   "Null": "Null",
   "Boolean": "Boolean",
   "String": "String",
-  "Calculator": "Calculator",
+  "Operator": "Operator",
   "Arithmetic calculation": "Arithmetic calculation",
   "String operation": "String operation",
   "Executed at": "Executed at",

package/dist/locale/es-ES.json

@@ -58,7 +58,7 @@
   "Null": "Null",
   "Boolean": "Booleano",
   "String": "Cadena",
-  "Calculator": "Calculadora",
+  "Operator": "Calculadora",
   "Arithmetic calculation": "Cálculo aritmético",
   "String operation": "Operación de Cadena",
   "Executed at": "Ejecutado en",

package/dist/locale/fr-FR.json

@@ -58,7 +58,7 @@
   "Null": "Null",
   "Boolean": "Booléen",
   "String": "Chaîne de caractères",
-  "Calculator": "Calculatrice",
+  "Operator": "Calculatrice",
   "Arithmetic calculation": "Calcul arithmétique",
   "String operation": "Opération sur les chaînes de caractères",
   "Executed at": "Exécuté à",

package/dist/locale/pt-BR.json

@@ -58,7 +58,7 @@
   "Null": "Nulo",
   "Boolean": "Booleano",
   "String": "String",
-  "Calculator": "Calculadora",
+  "Operator": "Calculadora",
   "Arithmetic calculation": "Cálculo aritmético",
   "String operation": "Operação de string",
   "Executed at": "Executado em",

package/dist/locale/zh-CN.json

@@ -83,7 +83,9 @@
   "End": "结束",
   "Node result": "节点数据",
   "Variable key of node": "节点变量标识",
-  "Calculator": "运算",
+  "Scope variables": "局域变量",
+
+  "Operator": "运算符",
   "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression can be static or dynamic one from an expression collections.":
     "基于计算引擎对一个表达式进行计算，并获得一个值作为结果。表达式中可以使用上游节点里的变量。表达式可以是静态的，也可以是表达式表中的动态表达式。",
   "String operation": "字符串",

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-12-21T12:51:37.067Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2024-01-03T02:11:26.806Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2023-12-21T12:51:36.734Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2024-01-03T02:11:26.452Z"}

package/dist/server/Plugin.d.ts

@@ -3,31 +3,31 @@ import { Registry } from '@nocobase/utils';
 import { Logger } from '@nocobase/logger';
 import Processor from './Processor';
 import { CustomFunction } from './functions';
-import type Trigger from './triggers';
-import type Instruction from './instructions';
+import Trigger from './triggers';
+import { InstructionInterface } from './instructions';
 import type { ExecutionModel, WorkflowModel } from './types';
 type ID = number | string;
 export default class WorkflowPlugin extends Plugin {
-    instructions: Registry<Instruction>;
+    instructions: Registry<InstructionInterface>;
     triggers: Registry<Trigger>;
     functions: Registry<CustomFunction>;
     private ready;
     private executing;
     private pending;
     private events;
+    private eventsCount;
     private loggerCache;
+    private meter;
     getLogger(workflowId: ID): Logger;
     onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
-    initTriggers<T extends Trigger>(more?: {
-        [key: string]: T | {
-            new (p: Plugin): T;
-        };
+    registerTrigger<T extends Trigger>(type: string, trigger: T | {
+        new (p: Plugin): T;
     }): void;
-    initInstructions<T extends Instruction>(more?: {
-        [key: string]: T | {
-            new (p: Plugin): T;
-        };
+    registerInstruction(type: string, instruction: InstructionInterface | {
+        new (p: Plugin): InstructionInterface;
     }): void;
+    private initTriggers;
+    private initInstructions;
     load(): Promise<void>;
     toggle(workflow: WorkflowModel, enable?: boolean): void;
     trigger(workflow: WorkflowModel, context: object, options?: {

package/dist/server/Plugin.js

@@ -32,11 +32,9 @@ __export(Plugin_exports, {
 module.exports = __toCommonJS(Plugin_exports);
 var import_path = __toESM(require("path"));
 var import_lru_cache = __toESM(require("lru-cache"));
-var import_winston = __toESM(require("winston"));
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
-var import_logger = require("@nocobase/logger");
 var import_Processor = __toESM(require("./Processor"));
 var import_actions = __toESM(require("./actions"));
 var import_constants = require("./constants");
@@ -57,7 +55,9 @@ class WorkflowPlugin extends import_server.Plugin {
   executing = null;
   pending = [];
   events = [];
+  eventsCount = 0;
   loggerCache;
+  meter = null;
   getLogger(workflowId) {
     const now = /* @__PURE__ */ new Date();
     const date = `${now.getFullYear()}-${`0${now.getMonth() + 1}`.slice(-2)}-${`0${now.getDate()}`.slice(-2)}`;
@@ -65,14 +65,10 @@ class WorkflowPlugin extends import_server.Plugin {
     if (this.loggerCache.has(key)) {
       return this.loggerCache.get(key);
     }
-    const logger = (0, import_logger.createLogger)({
-      transports: [
-        ...process.env.NODE_ENV !== "production" ? ["console"] : [],
-        new import_winston.default.transports.File({
-          filename: (0, import_logger.getLoggerFilePath)("workflows", date, `${workflowId}.log`),
-          level: (0, import_logger.getLoggerLevel)()
-        })
-      ]
+    const logger = this.createLogger({
+      dirname: import_path.default.join("workflows", date),
+      filename: `${workflowId}.log`,
+      transports: [...process.env.NODE_ENV !== "production" ? ["console"] : ["file"]]
     });
     this.loggerCache.set(key, logger);
     return logger;
@@ -116,24 +112,40 @@ class WorkflowPlugin extends import_server.Plugin {
       this.toggle(previous, false);
     }
   };
+  registerTrigger(type, trigger) {
+    if (typeof trigger === "function") {
+      this.triggers.register(type, new trigger(this));
+    } else if (trigger) {
+      this.triggers.register(type, trigger);
+    } else {
+      throw new Error("invalid trigger type to register");
+    }
+  }
+  registerInstruction(type, instruction) {
+    if (typeof instruction === "function") {
+      this.instructions.register(type, new instruction(this));
+    } else if (instruction) {
+      this.instructions.register(type, instruction);
+    } else {
+      throw new Error("invalid instruction type to register");
+    }
+  }
   initTriggers(more = {}) {
-    const { triggers } = this;
-    triggers.register("collection", new import_CollectionTrigger.default(this));
-    triggers.register("schedule", new import_ScheduleTrigger.default(this));
+    this.registerTrigger("collection", import_CollectionTrigger.default);
+    this.registerTrigger("schedule", import_ScheduleTrigger.default);
     for (const [name, trigger] of Object.entries(more)) {
-      triggers.register(name, typeof trigger === "function" ? new trigger(this) : trigger);
+      this.registerTrigger(name, trigger);
     }
   }
   initInstructions(more = {}) {
-    const { instructions } = this;
-    instructions.register("calculation", new import_CalculationInstruction.default(this));
-    instructions.register("condition", new import_ConditionInstruction.default(this));
-    instructions.register("create", new import_CreateInstruction.default(this));
-    instructions.register("destroy", new import_DestroyInstruction.default(this));
-    instructions.register("query", new import_QueryInstruction.default(this));
-    instructions.register("update", new import_UpdateInstruction.default(this));
+    this.registerInstruction("calculation", import_CalculationInstruction.default);
+    this.registerInstruction("condition", import_ConditionInstruction.default);
+    this.registerInstruction("create", import_CreateInstruction.default);
+    this.registerInstruction("destroy", import_DestroyInstruction.default);
+    this.registerInstruction("query", import_QueryInstruction.default);
+    this.registerInstruction("update", import_UpdateInstruction.default);
     for (const [name, instruction] of Object.entries({ ...more })) {
-      instructions.register(name, typeof instruction === "function" ? new instruction(this) : instruction);
+      this.registerInstruction(name, instruction);
     }
   }
   async load() {
@@ -149,6 +161,11 @@ class WorkflowPlugin extends import_server.Plugin {
         logger.end();
       }
     });
+    this.meter = this.app.telemetry.metric.getMeter();
+    const counter = this.meter.createObservableGauge("workflow.events.counter");
+    counter.addCallback((result) => {
+      result.observe(this.eventsCount);
+    });
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.workflows`,
       actions: [
@@ -164,7 +181,6 @@ class WorkflowPlugin extends import_server.Plugin {
       name: "ui.*",
       actions: ["workflows:list"]
     });
-    this.app.acl.allow("users_jobs", ["list", "get", "submit"], "loggedIn");
     this.app.acl.allow("workflows", ["trigger"], "loggedIn");
     await db.import({
       directory: import_path.default.resolve(__dirname, "collections")
@@ -213,6 +229,10 @@ class WorkflowPlugin extends import_server.Plugin {
   toggle(workflow, enable) {
     const type = workflow.get("type");
     const trigger = this.triggers.get(type);
+    if (!trigger) {
+      this.getLogger(workflow.id).error(`trigger type ${workflow.type} of workflow ${workflow.id} is not implemented`);
+      return;
+    }
     if (typeof enable !== "undefined" ? enable : workflow.get("enabled")) {
       const prev = workflow.previous();
       if (prev.config) {
@@ -235,6 +255,7 @@ class WorkflowPlugin extends import_server.Plugin {
       return;
     }
     this.events.push([workflow, context, options]);
+    this.eventsCount = this.events.length;
     logger.info(`new event triggered, now events: ${this.events.length}`);
     logger.debug(`event data:`, {
       data: context
@@ -273,8 +294,8 @@ class WorkflowPlugin extends import_server.Plugin {
         return null;
       }
     }
-    const execution = await this.db.sequelize.transaction(async (transaction) => {
-      const execution2 = await workflow.createExecution(
+    return this.db.sequelize.transaction(async (transaction) => {
+      const execution = await workflow.createExecution(
         {
           context,
           key: workflow.key,
@@ -282,6 +303,7 @@ class WorkflowPlugin extends import_server.Plugin {
         },
         { transaction }
       );
+      this.getLogger(workflow.id).info(`execution of workflow ${workflow.id} created as ${execution.id}`);
       await workflow.increment(["executed", "allExecuted"], { transaction });
       if (this.db.options.dialect !== "postgres") {
         await workflow.reload({ transaction });
@@ -297,17 +319,13 @@ class WorkflowPlugin extends import_server.Plugin {
           transaction
         }
       );
-      execution2.workflow = workflow;
-      return execution2;
+      execution.workflow = workflow;
+      return execution;
     });
-    this.getLogger(workflow.id).info(`execution of workflow ${workflow.id} created as ${execution.id}`);
-    if (!this.executing && !this.pending.length) {
-      this.pending.push([execution]);
-    }
-    return execution;
   }
   prepare = async () => {
     const event = this.events.shift();
+    this.eventsCount = this.events.length;
     if (!event) {
       this.getLogger("dispatcher").warn(`events queue is empty, no need to prepare`);
       return;
@@ -315,7 +333,10 @@ class WorkflowPlugin extends import_server.Plugin {
     const logger = this.getLogger(event[0].id);
     logger.info(`preparing execution for event`);
     try {
-      await this.createExecution(event);
+      const execution = await this.createExecution(event);
+      if (!this.executing && !this.pending.length) {
+        this.pending.push([execution]);
+      }
     } catch (err) {
       logger.error(`failed to create execution: ${err.message}`, err);
     }
@@ -343,6 +364,7 @@ class WorkflowPlugin extends import_server.Plugin {
         const execution = await this.db.getRepository("executions").findOne({
           filter: {
             status: import_constants.EXECUTION_STATUS.QUEUEING,
+            "workflow.enabled": true,
             "workflow.id": {
               [import_database.Op.not]: null
             }
@@ -350,7 +372,7 @@ class WorkflowPlugin extends import_server.Plugin {
           appends: ["workflow"],
           sort: "createdAt"
         });
-        if (execution && execution.workflow.enabled) {
+        if (execution) {
           this.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
           next = [execution];
         }

package/dist/server/Processor.d.ts

@@ -1,4 +1,4 @@
-import { Transaction, Transactionable } from '@nocobase/database';
+import { Transactionable } from '@nocobase/database';
 import { Logger } from '@nocobase/logger';
 import type Plugin from './Plugin';
 import type { ExecutionModel, FlowNodeModel, JobModel } from './types';
@@ -9,10 +9,16 @@ export default class Processor {
     execution: ExecutionModel;
     options: ProcessorOptions;
     static StatusMap: {
-        [x: number]: number;
+        0: 0;
+        1: 1;
+        [-1]: -1;
+        [-2]: -2;
+        [-3]: -3;
+        [-4]: -4;
+        [-5]: -5;
+        [-6]: -6;
     };
     logger: Logger;
-    transaction?: Transaction;
     nodes: FlowNodeModel[];
     nodesMap: Map<number, FlowNodeModel>;
     jobsMap: Map<number, JobModel>;
@@ -22,11 +28,9 @@ export default class Processor {
     constructor(execution: ExecutionModel, options: ProcessorOptions);
     private makeNodes;
     private makeJobs;
-    private getTransaction;
     prepare(): Promise<void>;
     start(): Promise<void>;
     resume(job: JobModel): Promise<void>;
-    private commit;
     private exec;
     run(node: any, input?: any): any;
     end(node: any, job: JobModel): Promise<any>;

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,26 +67,15 @@ 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);
   }
@@ -113,11 +101,6 @@ class Processor {
     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);