@nocobase/plugin-workflow 2.3.0-alpha.1 → 2.3.0-beta.2

package/dist/server/Plugin.js

@@ -42,6 +42,7 @@ __export(Plugin_exports, {
 module.exports = __toCommonJS(Plugin_exports);
 var import_path = __toESM(require("path"));
 var import_nodejs_snowflake = require("nodejs-snowflake");
+var import_sequelize = require("sequelize");
 var import_lru_cache = require("lru-cache");
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
@@ -53,6 +54,7 @@ var import_RunningExecutionRegistry = __toESM(require("./RunningExecutionRegistr
 var import_actions = __toESM(require("./actions"));
 var import_nodes = require("./actions/nodes");
 var import_workflows = require("./actions/workflows");
+var import_constants = require("./constants");
 var import_functions = __toESM(require("./functions"));
 var import_CollectionTrigger = __toESM(require("./triggers/CollectionTrigger"));
 var import_ScheduleTrigger = __toESM(require("./triggers/ScheduleTrigger"));
@@ -82,6 +84,7 @@ class PluginWorkflowServer extends import_server.Plugin {
   loggerCache;
   meter = null;
   checker = null;
+  taskStatsProviders = /* @__PURE__ */ new Map();
   onBeforeSave = async (instance, { transaction, cycling }) => {
     if (cycling) {
       return;
@@ -170,16 +173,16 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
     }
     this.checker = setInterval(() => {
-      this.dispatcher.dispatch();
+      this.dispatcher.recover({ gracePeriod: 6e4 });
     }, 3e5);
     await this.timeoutManager.load();
-    this.app.on("workflow:dispatch", () => {
-      this.app.logger.info("workflow:dispatch");
-      this.dispatcher.dispatch();
+    this.app.on("workflow:recover", () => {
+      this.app.logger.info("workflow:recover");
+      this.dispatcher.recover();
     });
     this.dispatcher.setReady(true);
     this.getLogger("dispatcher").info("(starting) check for queueing executions");
-    this.dispatcher.dispatch();
+    this.dispatcher.recover();
   };
   onBeforeStop = async () => {
     if (this.checker) {
@@ -191,7 +194,6 @@ class PluginWorkflowServer extends import_server.Plugin {
     for (const workflow of this.enabledCache.values()) {
       this.toggle(workflow, false, { silent: true });
     }
-    this.app.eventQueue.unsubscribe(this.channelPendingExecution);
     this.loggerCache.clear();
   };
   async handleSyncMessage(message) {
@@ -223,7 +225,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     return this.timeoutManager.abortExecutionIfExpired(execution, options);
   }
   registerRunningExecution(executionId, abort) {
-    this.runningExecutionRegistry.register(executionId, { abort });
+    return this.runningExecutionRegistry.register(executionId, { abort });
   }
   unregisterRunningExecution(executionId) {
     this.runningExecutionRegistry.unregister(executionId);
@@ -393,6 +395,7 @@ class PluginWorkflowServer extends import_server.Plugin {
       actions: ["workflows:list"]
     });
     this.app.acl.allow("userWorkflowTasks", "listMine", "loggedIn");
+    this.app.acl.allow("userWorkflowTaskStats", "listMine", "loggedIn");
     db.on("workflows.beforeSave", this.onBeforeSave);
     db.on("workflows.afterCreate", this.onAfterCreate);
     db.on("workflows.afterUpdate", this.onAfterUpdate);
@@ -401,7 +404,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     this.app.on("beforeStop", this.onBeforeStop);
     this.app.eventQueue.subscribe(this.channelPendingExecution, {
       idle: () => this.serving() && this.dispatcher.idle,
-      process: this.dispatcher.onQueueExecution
+      process: this.dispatcher.onQueueTask
     });
   }
   toggle(workflow, enable, { silent, transaction } = {}) {
@@ -448,25 +451,70 @@ class PluginWorkflowServer extends import_server.Plugin {
   trigger(workflow, context, options = {}) {
     return this.dispatcher.trigger(workflow, context, options);
   }
-  async run(pending) {
-    return this.dispatcher.run(pending);
+  async rerun(execution, rerun) {
+    return this.dispatcher.enqueue({ executionId: this.getModelId(execution), rerun: rerun ?? {} });
   }
-  dispatch() {
-    return this.dispatcher.dispatch();
+  recover() {
+    return this.dispatcher.recover();
   }
+  /**
+   * Persist the current job state and publish a poke that evaluates that state.
+   *
+   * PENDING resume calls are valid for instructions such as delay and sequential approval.
+   * Callers that aggregate multiple user actions must only call this method when their
+   * atomic update changes the job from PENDING to a terminal status.
+   * Persistence and queue publication failures are logged and rethrown to awaiting callers.
+   */
   async resume(job) {
-    return this.dispatcher.resume(job);
+    var _a;
+    const executionId = job.executionId ?? ((_a = job.execution) == null ? void 0 : _a.id);
+    if (executionId == null) {
+      this.getLogger("dispatcher").warn(`execution id of job (${job.id}) not found, resume ignored`);
+      return;
+    }
+    try {
+      if (job.changed()) {
+        await job.save();
+      }
+    } catch (error) {
+      this.getLogger("dispatcher").error(
+        `persisting job (${job.id}) before resuming execution (${executionId}) failed`,
+        { error, executionId, jobId: job.id }
+      );
+      throw error;
+    }
+    try {
+      await this.dispatcher.enqueue({ executionId, jobId: job.id });
+      this.getLogger("dispatcher").info(`execution (${executionId}) resuming from job (${job.id}) published to queue`);
+    } catch (error) {
+      this.getLogger("dispatcher").error(
+        `publishing resume task for execution (${executionId}) from job (${job.id}) failed`,
+        { error, executionId, jobId: job.id }
+      );
+      throw error;
+    }
   }
   /**
    * Start a deferred execution
    * @experimental
    */
   async start(execution) {
-    return this.dispatcher.start(execution);
+    if (typeof execution !== "string" && typeof execution !== "number") {
+      if (execution.status !== import_constants.EXECUTION_STATUS.QUEUEING && execution.status !== import_constants.EXECUTION_STATUS.STARTED && execution.status != null) {
+        return;
+      }
+      if (execution.status === import_constants.EXECUTION_STATUS.STARTED && execution.startedAt) {
+        return;
+      }
+    }
+    return this.dispatcher.enqueue({ executionId: this.getModelId(execution) });
   }
   createProcessor(execution, options = {}) {
     return new import_Processor.default(execution, { ...options, plugin: this });
   }
+  getModelId(input) {
+    return typeof input === "string" || typeof input === "number" ? input : input.id;
+  }
   async execute(workflow, values, options = {}) {
     const trigger = this.triggers.get(workflow.type);
     if (!trigger) {
@@ -493,12 +541,304 @@ class PluginWorkflowServer extends import_server.Plugin {
       return db.sequelize.transaction();
     }
   }
+  registerTaskStatsProvider(type, provider) {
+    this.taskStatsProviders.set(type, provider);
+  }
+  async getWorkflowIdsByKey(workflowKey, transaction) {
+    const WorkflowRepo = this.db.getRepository("workflows");
+    const workflows = await WorkflowRepo.find({
+      filter: {
+        key: workflowKey
+      },
+      fields: ["id"],
+      transaction
+    });
+    return workflows.map((workflow) => workflow.id);
+  }
+  buildTaskStatsFilter(options) {
+    var _a, _b, _c;
+    const filter = {};
+    if ((_a = options.userIds) == null ? void 0 : _a.length) {
+      filter.userId = options.userIds;
+    }
+    if ((_b = options.workflowKeys) == null ? void 0 : _b.length) {
+      filter.workflowKey = options.workflowKeys;
+    }
+    if ((_c = options.types) == null ? void 0 : _c.length) {
+      filter.type = options.types;
+    }
+    return filter;
+  }
+  normalizeTaskStats(stats = {}) {
+    return {
+      pending: Number(stats.pending) || 0,
+      all: Number(stats.all) || 0
+    };
+  }
+  async upsertTaskStatsRow(row, transaction) {
+    const repository = this.db.getRepository("userWorkflowTaskStats");
+    const values = {
+      userId: row.userId,
+      workflowKey: row.workflowKey,
+      type: row.type,
+      ...this.normalizeTaskStats(row)
+    };
+    const record = await repository.findOne({
+      filter: {
+        userId: row.userId,
+        workflowKey: row.workflowKey,
+        type: row.type
+      },
+      transaction
+    });
+    if (record) {
+      await record.update(values, { transaction });
+      return record;
+    }
+    return repository.create({
+      values,
+      transaction
+    });
+  }
+  async refreshUserWorkflowTaskTypeStats(userId, type, { transaction } = {}) {
+    const repository = this.db.getRepository("userWorkflowTaskStats");
+    const rows = await repository.find({
+      filter: {
+        userId,
+        type
+      },
+      fields: ["pending", "all"],
+      transaction
+    });
+    const stats = rows.reduce(
+      (result, row) => ({
+        pending: result.pending + (Number(row.pending) || 0),
+        all: result.all + (Number(row.all) || 0)
+      }),
+      { pending: 0, all: 0 }
+    );
+    await this.updateTasksStats(userId, type, stats, { transaction });
+    return stats;
+  }
+  async refreshUserWorkflowTaskWorkflowStats(userId, workflowKey, { transaction } = {}) {
+    const repository = this.db.getRepository("userWorkflowTaskStats");
+    const rows = await repository.find({
+      filter: {
+        userId,
+        workflowKey
+      },
+      fields: ["pending", "all"],
+      transaction
+    });
+    return rows.reduce(
+      (result, row) => ({
+        pending: result.pending + (Number(row.pending) || 0),
+        all: result.all + (Number(row.all) || 0)
+      }),
+      { pending: 0, all: 0 }
+    );
+  }
+  sendTaskWorkflowStatsUpdated(userId, workflowKey, stats) {
+    if (!userId) {
+      return;
+    }
+    this.app.emit("ws:sendToUser", {
+      userId,
+      message: {
+        type: "workflow:taskWorkflowStats:updated",
+        payload: {
+          userId,
+          workflowKey,
+          stats
+        }
+      }
+    });
+  }
+  async updateTaskStatsByWorkflow(input, { transaction } = {}) {
+    await this.upsertTaskStatsRow(
+      {
+        userId: input.userId,
+        workflowKey: input.workflowKey,
+        type: input.type,
+        ...this.normalizeTaskStats(input.stats)
+      },
+      transaction
+    );
+    await this.refreshUserWorkflowTaskTypeStats(input.userId, input.type, { transaction });
+    const workflowStats = await this.refreshUserWorkflowTaskWorkflowStats(input.userId, input.workflowKey, {
+      transaction
+    });
+    this.sendTaskWorkflowStatsUpdated(input.userId, input.workflowKey, workflowStats);
+  }
+  async repairTaskStats(options = {}) {
+    const run = async (transaction) => {
+      var _a, _b;
+      const repository = this.db.getRepository("userWorkflowTaskStats");
+      const TaskStatsModel = this.db.getModel("userWorkflowTaskStats");
+      const filter = this.buildTaskStatsFilter(options);
+      const existedRows = await repository.find({
+        filter,
+        fields: ["userId", "workflowKey", "type"],
+        transaction
+      });
+      const providers = Array.from(this.taskStatsProviders.entries()).filter(([type]) => {
+        var _a2;
+        return !((_a2 = options.types) == null ? void 0 : _a2.length) || options.types.includes(type);
+      });
+      const legacyRows = providers.length ? await this.db.getRepository("userWorkflowTasks").find({
+        filter: {
+          ...((_a = options.userIds) == null ? void 0 : _a.length) ? { userId: options.userIds } : {},
+          type: providers.map(([type]) => type)
+        },
+        fields: ["userId", "type"],
+        transaction
+      }) : [];
+      const collectedRows = (await Promise.all(
+        providers.map(([, provider]) => provider.collectTaskStats({ ...options, transaction }, { plugin: this }))
+      )).flat();
+      const rows = collectedRows.filter((row) => {
+        var _a2, _b2, _c;
+        if (((_a2 = options.userIds) == null ? void 0 : _a2.length) && !options.userIds.includes(row.userId)) {
+          return false;
+        }
+        if (((_b2 = options.workflowKeys) == null ? void 0 : _b2.length) && !options.workflowKeys.includes(row.workflowKey)) {
+          return false;
+        }
+        if (((_c = options.types) == null ? void 0 : _c.length) && !options.types.includes(row.type)) {
+          return false;
+        }
+        return true;
+      });
+      await repository.destroy({
+        filter,
+        transaction
+      });
+      const batchSize = 1e3;
+      for (let offset = 0; offset < rows.length; offset += batchSize) {
+        await TaskStatsModel.bulkCreate(rows.slice(offset, offset + batchSize), {
+          returning: false,
+          transaction
+        });
+      }
+      const typePairs = /* @__PURE__ */ new Set();
+      const workflowPairs = /* @__PURE__ */ new Set();
+      if ((_b = options.userIds) == null ? void 0 : _b.length) {
+        for (const userId of options.userIds) {
+          for (const [type] of providers) {
+            typePairs.add(`${userId}\0${type}`);
+          }
+          for (const workflowKey of options.workflowKeys ?? []) {
+            workflowPairs.add(`${userId}\0${workflowKey}`);
+          }
+        }
+      }
+      for (const row of legacyRows) {
+        typePairs.add(`${row.userId}\0${row.type}`);
+      }
+      for (const row of [...existedRows, ...rows]) {
+        typePairs.add(`${row.userId}\0${row.type}`);
+        workflowPairs.add(`${row.userId}\0${row.workflowKey}`);
+      }
+      const affectedUserIds = Array.from(typePairs, (pair) => Number(pair.slice(0, pair.indexOf("\0"))));
+      const affectedTypes = Array.from(typePairs, (pair) => pair.slice(pair.indexOf("\0") + 1));
+      const categorizedRows = typePairs.size ? await TaskStatsModel.findAll({
+        attributes: ["userId", "type", [(0, import_sequelize.fn)("SUM", (0, import_sequelize.col)("pending")), "pending"], [(0, import_sequelize.fn)("SUM", (0, import_sequelize.col)("all")), "all"]],
+        where: {
+          userId: Array.from(new Set(affectedUserIds)),
+          type: Array.from(new Set(affectedTypes))
+        },
+        group: ["userId", "type"],
+        raw: true,
+        transaction
+      }) : [];
+      const categorizedMap = new Map(
+        categorizedRows.map((row) => [
+          `${row.userId}\0${row.type}`,
+          this.normalizeTaskStats({ pending: row.pending, all: row.all })
+        ])
+      );
+      const categorizedValues = Array.from(typePairs, (pair) => {
+        const separatorIndex = pair.indexOf("\0");
+        return {
+          userId: Number(pair.slice(0, separatorIndex)),
+          type: pair.slice(separatorIndex + 1),
+          stats: categorizedMap.get(pair) ?? { pending: 0, all: 0 }
+        };
+      });
+      const categorizedUserIds = Array.from(new Set(affectedUserIds));
+      const categorizedTypes = Array.from(new Set(affectedTypes));
+      if (categorizedUserIds.length && categorizedTypes.length) {
+        await this.db.getRepository("userWorkflowTasks").destroy({
+          filter: {
+            userId: categorizedUserIds,
+            type: categorizedTypes
+          },
+          transaction
+        });
+      }
+      const UserTasksModel = this.db.getModel("userWorkflowTasks");
+      for (let offset = 0; offset < categorizedValues.length; offset += batchSize) {
+        await UserTasksModel.bulkCreate(categorizedValues.slice(offset, offset + batchSize), {
+          returning: false,
+          transaction
+        });
+      }
+      if (options.silent) {
+        return;
+      }
+      for (const value of categorizedValues) {
+        if (!value.userId) {
+          continue;
+        }
+        this.app.emit("ws:sendToUser", {
+          userId: value.userId,
+          message: { type: "workflow:tasks:updated", payload: value }
+        });
+      }
+      const affectedWorkflowUserIds = Array.from(workflowPairs, (pair) => Number(pair.slice(0, pair.indexOf("\0"))));
+      const affectedWorkflowKeys = Array.from(workflowPairs, (pair) => pair.slice(pair.indexOf("\0") + 1));
+      const workflowRows = workflowPairs.size ? await TaskStatsModel.findAll({
+        attributes: [
+          "userId",
+          "workflowKey",
+          [(0, import_sequelize.fn)("SUM", (0, import_sequelize.col)("pending")), "pending"],
+          [(0, import_sequelize.fn)("SUM", (0, import_sequelize.col)("all")), "all"]
+        ],
+        where: {
+          userId: Array.from(new Set(affectedWorkflowUserIds)),
+          workflowKey: Array.from(new Set(affectedWorkflowKeys))
+        },
+        group: ["userId", "workflowKey"],
+        raw: true,
+        transaction
+      }) : [];
+      const workflowMap = new Map(
+        workflowRows.map((row) => [
+          `${row.userId}\0${row.workflowKey}`,
+          this.normalizeTaskStats({ pending: row.pending, all: row.all })
+        ])
+      );
+      for (const pair of workflowPairs) {
+        const separatorIndex = pair.indexOf("\0");
+        const userId = Number(pair.slice(0, separatorIndex));
+        const workflowKey = pair.slice(separatorIndex + 1);
+        this.sendTaskWorkflowStatsUpdated(userId, workflowKey, workflowMap.get(pair) ?? { pending: 0, all: 0 });
+      }
+    };
+    if (options.transaction) {
+      await run(options.transaction);
+      return;
+    }
+    await this.db.sequelize.transaction(run);
+  }
   /**
    * @experimental
+   * @deprecated Use updateTaskStatsByWorkflow() when workflowKey is available.
    */
   async updateTasksStats(userId, type, stats = { pending: 0, all: 0 }, { transaction }) {
     const { db } = this.app;
     const repository = db.getRepository("userWorkflowTasks");
+    const normalizedStats = this.normalizeTaskStats(stats);
     let record = await repository.findOne({
       filter: {
         userId,
@@ -509,7 +849,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     if (record) {
       await record.update(
         {
-          stats
+          stats: normalizedStats
         },
         { transaction }
       );
@@ -518,7 +858,7 @@ class PluginWorkflowServer extends import_server.Plugin {
         values: {
           userId,
           type,
-          stats
+          stats: normalizedStats
         },
         transaction
       });

package/dist/server/Processor.d.ts

@@ -73,6 +73,7 @@ export default class Processor {
     abortController: AbortController;
     timeoutGuard: NodeJS.Timeout | null;
     private runningRegistered;
+    private unregisterRunningExecution?;
     private abortReason;
     private aborted;
     constructor(execution: ExecutionModel, options: ProcessorOptions);
@@ -101,13 +102,7 @@ export default class Processor {
     prepare(): Promise<void>;
     start(): Promise<any>;
     resume(job: JobModel): Promise<void>;
-    resolveRerun(options?: ProcessorRerunOptions): {
-        node: FlowNodeModel;
-        input: JobModel | {
-            result: any;
-        };
-        targetJob: JobModel;
-    };
+    private resolveRerun;
     rerun(options?: ProcessorRerunOptions): Promise<any>;
     private getRerunNode;
     private getRerunInput;

package/dist/server/Processor.js

@@ -46,6 +46,7 @@ var import_utils = require("@nocobase/utils");
 var import_set = __toESM(require("lodash/set"));
 var import_constants = require("./constants");
 var import_timeout_errors = require("./timeout-errors");
+const JOB_SAVE_BATCH_SIZE = 100;
 const OPEN_SCOPE_PENDING_ERROR = "Pending jobs are not allowed inside an open transaction scope";
 class Processor {
   constructor(execution, options) {
@@ -89,6 +90,7 @@ class Processor {
   abortController = new AbortController();
   timeoutGuard = null;
   runningRegistered = false;
+  unregisterRunningExecution;
   abortReason = null;
   aborted = false;
   get abortSignal() {
@@ -460,42 +462,51 @@ class Processor {
     }
     if (this.jobsToSave.size) {
       const newJobs = [];
+      const JobCollection = this.options.plugin.db.getCollection("jobs");
+      const JobsModel = this.options.plugin.db.getModel("jobs");
       for (const job of this.jobsToSave.values()) {
         if (job.isNewRecord) {
           newJobs.push(job);
         } else {
-          const JobCollection = this.options.plugin.db.getCollection("jobs");
           const changes = [];
           if (job.changed("status")) {
-            changes.push([`status`, job.status]);
-            job.changed("status", false);
+            changes.push(["status", job.status]);
           }
           if (job.changed("meta")) {
-            changes.push([`meta`, JSON.stringify(job.meta ?? null)]);
-            job.changed("meta", false);
+            changes.push(["meta", JSON.stringify(job.meta ?? null)]);
           }
           if (job.changed("result")) {
-            changes.push([`result`, JSON.stringify(job.result ?? null)]);
-            job.changed("result", false);
+            changes.push(["result", JSON.stringify(job.result ?? null)]);
+          }
+          if (job.changed("startedAt")) {
+            changes.push(["startedAt", job.startedAt]);
           }
           if (changes.length) {
+            const idColumn = JobsModel.rawAttributes.id.field || "id";
             await this.options.plugin.db.sequelize.query(
-              `UPDATE ${JobCollection.quotedTableName()} SET ${changes.map(([key]) => `${key} = ?`)} WHERE id='${job.id}'`,
+              `UPDATE ${JobCollection.quotedTableName()} SET ${changes.map(
+                ([field]) => `${this.options.plugin.db.quoteIdentifier(JobsModel.rawAttributes[field].field || field)} = ?`
+              )} WHERE ${this.options.plugin.db.quoteIdentifier(idColumn)}='${job.id}'`,
               { replacements: changes.map(([, value]) => value) }
             );
+            for (const [field] of changes) {
+              job.changed(field, false);
+            }
           }
         }
       }
       if (newJobs.length) {
-        const JobsModel = this.options.plugin.db.getModel("jobs");
-        await JobsModel.bulkCreate(
-          newJobs.map((job) => job.toJSON()),
-          {
-            returning: false
+        for (let offset = 0; offset < newJobs.length; offset += JOB_SAVE_BATCH_SIZE) {
+          const batch = newJobs.slice(offset, offset + JOB_SAVE_BATCH_SIZE);
+          await JobsModel.bulkCreate(
+            batch.map((job) => job.toJSON()),
+            {
+              returning: false
+            }
+          );
+          for (const job of batch) {
+            job.isNewRecord = false;
           }
-        );
-        for (const job of newJobs) {
-          job.isNewRecord = false;
         }
       }
       this.jobsToSave.clear();
@@ -640,6 +651,7 @@ class Processor {
     const { database } = this.execution.constructor;
     const model = database.getModel("jobs");
     let job;
+    const startedAt = Object.prototype.hasOwnProperty.call(payload, "startedAt") ? payload.startedAt : /* @__PURE__ */ new Date();
     if (payload instanceof model) {
       job = payload;
       job.set("updatedAt", /* @__PURE__ */ new Date());
@@ -649,6 +661,7 @@ class Processor {
         status: payload.status,
         result: Object.prototype.hasOwnProperty.call(payload, "result") ? payload.result : null,
         meta: Object.prototype.hasOwnProperty.call(payload, "meta") ? payload.meta : null,
+        startedAt,
         updatedAt: /* @__PURE__ */ new Date()
       });
     } else {
@@ -656,6 +669,7 @@ class Processor {
         {
           ...payload,
           id: this.options.plugin.snowflake.getUniqueID().toString(),
+          startedAt,
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date(),
           executionId: this.execution.id
@@ -684,7 +698,10 @@ class Processor {
     this.options.plugin.timeoutManager.clear(this.execution.id);
     this.abortReason = null;
     this.aborted = false;
-    this.options.plugin.registerRunningExecution(this.execution.id, (reason) => this.abortExecution(reason));
+    this.unregisterRunningExecution = this.options.plugin.registerRunningExecution(
+      this.execution.id,
+      (reason) => this.abortExecution(reason)
+    );
     this.runningRegistered = true;
     const remaining = this.execution.expiresAt ? this.execution.expiresAt.getTime() - Date.now() : null;
     if (remaining == null) {
@@ -700,6 +717,7 @@ class Processor {
     return this.options.plugin.timeoutManager.shouldContinue(this.execution);
   }
   leaveRunningState() {
+    var _a;
     if (this.timeoutGuard) {
       clearTimeout(this.timeoutGuard);
       this.timeoutGuard = null;
@@ -707,7 +725,8 @@ class Processor {
     if (!this.runningRegistered) {
       return;
     }
-    this.options.plugin.unregisterRunningExecution(this.execution.id);
+    (_a = this.unregisterRunningExecution) == null ? void 0 : _a.call(this);
+    this.unregisterRunningExecution = void 0;
     this.runningRegistered = false;
   }
   /**

package/dist/server/RunningExecutionRegistry.d.ts

@@ -11,8 +11,8 @@ type AbortHandler = {
 };
 export default class RunningExecutionRegistry {
     private readonly executions;
-    register(executionId: number | string, handler: AbortHandler): void;
-    unregister(executionId: number | string): void;
+    register(executionId: number | string, handler: AbortHandler): () => void;
+    unregister(executionId: number | string, handler?: AbortHandler): void;
     abort(executionId: number | string, reason?: string): boolean;
 }
 export {};

package/dist/server/RunningExecutionRegistry.js

@@ -32,17 +32,32 @@ module.exports = __toCommonJS(RunningExecutionRegistry_exports);
 class RunningExecutionRegistry {
   executions = /* @__PURE__ */ new Map();
   register(executionId, handler) {
-    this.executions.set(String(executionId), handler);
+    const key = String(executionId);
+    const handlers = this.executions.get(key) ?? /* @__PURE__ */ new Set();
+    handlers.add(handler);
+    this.executions.set(key, handlers);
+    return () => this.unregister(executionId, handler);
   }
-  unregister(executionId) {
-    this.executions.delete(String(executionId));
+  unregister(executionId, handler) {
+    const key = String(executionId);
+    if (!handler) {
+      this.executions.delete(key);
+      return;
+    }
+    const handlers = this.executions.get(key);
+    handlers == null ? void 0 : handlers.delete(handler);
+    if (!(handlers == null ? void 0 : handlers.size)) {
+      this.executions.delete(key);
+    }
   }
   abort(executionId, reason) {
-    const handler = this.executions.get(String(executionId));
-    if (!handler) {
+    const handlers = this.executions.get(String(executionId));
+    if (!(handlers == null ? void 0 : handlers.size)) {
       return false;
     }
-    handler.abort(reason);
+    for (const handler of handlers) {
+      handler.abort(reason);
+    }
     return true;
   }
 }