@iworkflow/dbos 0.4.0 → 0.5.0

package/dist/index.js

@@ -2,11 +2,14 @@
 import { DBOS, DBOSClient, Error as DBOSErrors } from "@dbos-inc/dbos-sdk";
 import {
   bindStepRuntime,
+  checkPriority,
+  DEFAULT_PRIORITY,
   exitSignal,
   Failure,
   FlowError,
   isFlowError
 } from "@iworkflow/core";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { Pool } from "pg";
 var resultPoll = () => ({ pollingIntervalMs: Number(process.env.DBOS_RESULT_POLL_MS) || undefined });
 var sysDb = () => process.env.DBOS_SYSTEM_DATABASE_URL ?? "postgres://iworkflow:iworkflow@localhost:55432/iworkflow";
@@ -93,17 +96,20 @@ class Semaphore {
   constructor(free) {
     this.free = free;
   }
-  async run(fn) {
+  async run(fn, priority = DEFAULT_PRIORITY) {
     if (this.free > 0)
       this.free--;
     else
-      await new Promise((r) => this.queue.push(r));
+      await new Promise((go) => {
+        const i = this.queue.findIndex((w) => w.priority > priority);
+        this.queue.splice(i < 0 ? this.queue.length : i, 0, { priority, go });
+      });
     try {
       return await fn();
     } finally {
       const next = this.queue.shift();
       if (next)
-        next();
+        next.go();
       else
         this.free++;
     }
@@ -113,6 +119,7 @@ class Semaphore {
 class AttemptTimeout extends Error {
 }
 var sleepMs = (ms) => new Promise((r) => setTimeout(r, ms));
+var attemptNo = new AsyncLocalStorage;
 async function withTimeout(p, ms) {
   let timer;
   try {
@@ -124,14 +131,14 @@ async function withTimeout(p, ms) {
     clearTimeout(timer);
   }
 }
-async function attempts(fn, args, opts, pool, alive) {
+async function attempts(fn, args, opts, pool, alive, priority) {
   const max = opts.attempts ?? 3;
   const started = Date.now();
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1;; n++) {
     try {
-      const attempt = () => withTimeout(fn(...args), opts.timeoutMs ?? 60000);
-      return await (pool ? pool.run(attempt) : attempt());
+      const attempt = () => attemptNo.run(n, () => withTimeout(fn(...args), opts.timeoutMs ?? 60000));
+      return await (pool ? pool.run(attempt, priority) : attempt());
     } catch (e) {
       const stop = e instanceof Failure && e.nonRetryable || (opts.nonRetryableTypes ?? []).includes(typeOf(e));
       if (stop || n >= max) {
@@ -145,15 +152,20 @@ async function attempts(fn, args, opts, pool, alive) {
           exhausted
         });
       }
-      if (opts.totalTimeoutMs !== undefined && Date.now() - started + interval >= opts.totalTimeoutMs)
+      const wait = e instanceof Failure && e.retryAfterMs !== undefined ? e.retryAfterMs : interval;
+      if (opts.totalTimeoutMs !== undefined && Date.now() - started + wait >= opts.totalTimeoutMs)
         throw new FlowError(e instanceof Error ? e.message : String(e), {
           reason: "timeout",
           type: typeOf(e),
           details: e instanceof Failure ? e.details : undefined
         });
-      await sleepMs(interval);
-      if (!await alive().catch(() => true))
-        throw new FlowError("процесс прерван — повторы шага остановлены", { reason: "terminated" });
+      let left = wait;
+      do {
+        await sleepMs(Math.min(Math.max(left, 0), 5000));
+        if (!await alive().catch(() => true))
+          throw new FlowError("процесс прерван — повторы шага остановлены", { reason: "terminated" });
+        left -= 5000;
+      } while (left > 0);
       interval = Math.min(interval * (opts.backoff ?? 1), opts.maxRetryIntervalMs ?? Infinity);
     }
   }
@@ -180,16 +192,23 @@ function dbosRuntime() {
       async lastHeartbeat() {
         const r = await db.query("SELECT details FROM iwf.heartbeat WHERE workflow_id = $1 AND step_id = $2", stepKey());
         return r.rows[0]?.details ?? undefined;
+      },
+      attempt: () => {
+        const n = attemptNo.getStore();
+        if (n === undefined)
+          throw new Error("stepAttempt вне шага");
+        return n;
       }
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
-    const enqueue = (target, args, opts, reject) => DBOS.enqueueWorkflowWithOptions({
+    const enqueue = (target, args, opts, reject, priority) => DBOS.enqueueWorkflowWithOptions({
       queueName: target.app,
       workflowName: target.flow,
       workflowID: opts.id,
       applicationName: target.app,
       ...opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {},
-      ...reject ? { workflowIDReusePolicy: "reject" } : {}
+      ...reject ? { workflowIDReusePolicy: "reject" } : {},
+      priority: priority ?? DEFAULT_PRIORITY
     }, ...args).catch(alreadyStarted(opts.id));
     const waitChild = async (h, id) => {
       try {
@@ -202,13 +221,15 @@ function dbosRuntime() {
       const run = async (...args) => {
         const workflowId = DBOS.workflowID;
         await patches.born(workflowId);
-        const row = (await db.query("SELECT created_at, parent_workflow_id FROM dbos.workflow_status WHERE workflow_uuid = $1", [
+        const row = (await db.query("SELECT created_at, parent_workflow_id, priority FROM dbos.workflow_status WHERE workflow_uuid = $1", [
           workflowId
         ])).rows[0];
         const ctx = {
           workflowId,
           parentId: row?.parent_workflow_id ?? undefined,
           startedAt: new Date(Number(row?.created_at)),
+          priority: row?.priority || DEFAULT_PRIORITY,
+          now: () => DBOS.now(),
           step: (step, stepArgs, opts = {}) => {
             const pool = opts.pool ? pools[opts.pool] : undefined;
             if (opts.pool && !pool)
@@ -225,16 +246,16 @@ function dbosRuntime() {
                 await sleepMs(100);
               }
             };
-            return DBOS.runStep(() => attempts(def.activities[step], stepArgs, opts, pool, alive), {
+            return DBOS.runStep(() => attempts(def.activities[step], stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority), {
               name: step,
               retriesAllowed: false
             }).catch((e) => {
               throw revive(e);
             });
           },
-          child: async (target, childArgs, opts) => waitChild(await enqueue(target, childArgs, opts, opts.onExisting === "reject"), opts.id),
+          child: async (target, childArgs, opts) => waitChild(await enqueue(target, childArgs, opts, opts.onExisting === "reject", ctx.priority), opts.id),
           async startChild(target, childArgs, opts) {
-            const h = await enqueue(target, childArgs, opts, true);
+            const h = await enqueue(target, childArgs, opts, true, ctx.priority);
             return { id: opts.id, result: () => waitChild(h, opts.id) };
           },
           sleep: (ms) => DBOS.sleep(ms),
@@ -311,20 +332,29 @@ async function dbosClient() {
       await client.cancelWorkflow(id);
     }
   });
-  return {
+  const self = {
     async start(target, args, opts) {
       const h = await client.enqueue({
         queueName: target.app,
         workflowName: target.flow,
         workflowID: opts.id,
         applicationName: target.app,
-        ...opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {}
+        ...opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {},
+        priority: checkPriority(opts.priority) ?? DEFAULT_PRIORITY
       }, ...args);
       return wrap(h.workflowID);
     },
+    async signalWithStart(target, args, opts, topic, value) {
+      const h = await self.start(target, args, opts);
+      if (FINISHED.has((await status(h.id))?.status ?? ""))
+        throw new FlowError(`процесс ${h.id} уже завершён — id не переиспользуется`, { reason: "already-started" });
+      await client.send(h.id, value, topic);
+      return h;
+    },
     handle: (id) => wrap(id),
     close: () => client.destroy()
   };
+  return self;
 }
 export {
   dbosClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iworkflow/dbos",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "DBOS adapter for @iworkflow/core",
   "keywords": [
     "workflow",
@@ -37,7 +37,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@iworkflow/core": "^0.4.0",
+    "@iworkflow/core": "^0.5.0",
     "pg": "^8.0.0"
   },
   "peerDependencies": {

package/src/index.ts

@@ -3,6 +3,8 @@
 import { DBOS, DBOSClient, Error as DBOSErrors, type WorkflowStatus } from "@dbos-inc/dbos-sdk";
 import {
   bindStepRuntime,
+  checkPriority,
+  DEFAULT_PRIORITY,
   exitSignal,
   Failure,
   FlowError,
@@ -14,9 +16,12 @@ import {
   type EngineRuntime,
   type FlowContext,
   type FlowHandle,
+  type FlowRef,
   type FlowStatus,
+  type StartOptions,
   type StepOptions,
 } from "@iworkflow/core";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { Pool } from "pg";
 
 // Ожидание результата дочернего процесса — опрос базы, по умолчанию раз в секунду: это и есть
@@ -135,17 +140,22 @@ const alreadyStarted = (id: string) => (e: unknown): never => {
 // Повторы — свои, внутри одного шага DBOS: в историю пишется уже FlowError с причиной, как у Temporal.
 // Цена: отмена процесса не прерывает повторы шага, а ждёт его конца.
 
+/** Предел одновременных шагов пула; ждущие выходят по приоритету (1 — первым), внутри — по очереди. */
 class Semaphore {
-  private queue: (() => void)[] = [];
+  private queue: { priority: number; go: () => void }[] = [];
   constructor(private free: number) {}
-  async run<T>(fn: () => Promise<T>): Promise<T> {
+  async run<T>(fn: () => Promise<T>, priority = DEFAULT_PRIORITY): Promise<T> {
     if (this.free > 0) this.free--;
-    else await new Promise<void>((r) => this.queue.push(r));
+    else
+      await new Promise<void>((go) => {
+        const i = this.queue.findIndex((w) => w.priority > priority);
+        this.queue.splice(i < 0 ? this.queue.length : i, 0, { priority, go });
+      });
     try {
       return await fn();
     } finally {
       const next = this.queue.shift();
-      if (next) next();
+      if (next) next.go();
       else this.free++;
     }
   }
@@ -155,6 +165,9 @@ class AttemptTimeout extends Error {}
 
 const sleepMs = (ms: number) => new Promise((r) => setTimeout(r, ms));
 
+/** Номер идущей попытки шага — для stepAttempt(). */
+const attemptNo = new AsyncLocalStorage<number>();
+
 /** Попытка, урезанная по сроку: брошенная продолжает идти в фоне, её итог отбрасывается. */
 async function withTimeout<T>(p: Promise<T>, ms: number): Promise<T> {
   let timer: ReturnType<typeof setTimeout> | undefined;
@@ -175,14 +188,15 @@ async function attempts(
   opts: StepOptions,
   pool: Semaphore | undefined,
   alive: () => Promise<boolean>,
+  priority: number | undefined,
 ) {
   const max = opts.attempts ?? 3;
   const started = Date.now();
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1; ; n++) {
     try {
-      const attempt = () => withTimeout(fn(...args), opts.timeoutMs ?? 60_000);
-      return await (pool ? pool.run(attempt) : attempt());
+      const attempt = () => attemptNo.run(n, () => withTimeout(fn(...args), opts.timeoutMs ?? 60_000));
+      return await (pool ? pool.run(attempt, priority) : attempt());
     } catch (e) {
       const stop = (e instanceof Failure && e.nonRetryable) || (opts.nonRetryableTypes ?? []).includes(typeOf(e));
       if (stop || n >= max) {
@@ -195,16 +209,24 @@ async function attempts(
           exhausted,
         });
       }
-      if (opts.totalTimeoutMs !== undefined && Date.now() - started + interval >= opts.totalTimeoutMs)
+      // Отказ сам назвал срок (FLOOD_WAIT) — ждём его, а не паузу из opts.
+      const wait = e instanceof Failure && e.retryAfterMs !== undefined ? e.retryAfterMs : interval;
+      if (opts.totalTimeoutMs !== undefined && Date.now() - started + wait >= opts.totalTimeoutMs)
         throw new FlowError(e instanceof Error ? e.message : String(e), {
           reason: "timeout",
           type: typeOf(e),
           details: e instanceof Failure ? e.details : undefined,
         });
-      await sleepMs(interval);
-      // После паузы: за неё процесс мог выйти по сроку или быть отменён.
+      // Пауза кусками: срок или отмена процесса видны не позже чем через 5 с, а не после всей паузы.
       // Сбой чтения статуса — не повод бросать шаг: повторяем дальше.
-      if (!(await alive().catch(() => true))) throw new FlowError("процесс прерван — повторы шага остановлены", { reason: "terminated" });
+      // do…while: и при нулевой паузе статус процесса проверяется перед каждой попыткой.
+      let left = wait;
+      do {
+        await sleepMs(Math.min(Math.max(left, 0), 5_000));
+        if (!(await alive().catch(() => true)))
+          throw new FlowError("процесс прерван — повторы шага остановлены", { reason: "terminated" });
+        left -= 5_000;
+      } while (left > 0);
       interval = Math.min(interval * (opts.backoff ?? 1), opts.maxRetryIntervalMs ?? Infinity);
     }
   }
@@ -241,9 +263,20 @@ export function dbosRuntime(): EngineRuntime {
         const r = await db.query("SELECT details FROM iwf.heartbeat WHERE workflow_id = $1 AND step_id = $2", stepKey());
         return r.rows[0]?.details ?? undefined;
       },
+      attempt: () => {
+        const n = attemptNo.getStore();
+        if (n === undefined) throw new Error("stepAttempt вне шага");
+        return n;
+      },
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
-    const enqueue = (target: { app: string; flow: string }, args: unknown[], opts: ChildOptions, reject: boolean) =>
+    const enqueue = (
+      target: { app: string; flow: string },
+      args: unknown[],
+      opts: ChildOptions,
+      reject: boolean,
+      priority: number | undefined,
+    ) =>
       DBOS.enqueueWorkflowWithOptions(
         {
           queueName: target.app,
@@ -252,6 +285,8 @@ export function dbosRuntime(): EngineRuntime {
           applicationName: target.app,
           ...(opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {}),
           ...(reject ? { workflowIDReusePolicy: "reject" as const } : {}),
+          // Ребёнок наследует приоритет родителя, как у Temporal.
+          priority: priority ?? DEFAULT_PRIORITY,
         },
         ...args,
       ).catch(alreadyStarted(opts.id));
@@ -268,7 +303,7 @@ export function dbosRuntime(): EngineRuntime {
         await patches.born(workflowId);
         // Строка статуса не меняется после создания: чтение вне шага детерминировано.
         const row = (
-          await db.query("SELECT created_at, parent_workflow_id FROM dbos.workflow_status WHERE workflow_uuid = $1", [
+          await db.query("SELECT created_at, parent_workflow_id, priority FROM dbos.workflow_status WHERE workflow_uuid = $1", [
             workflowId,
           ])
         ).rows[0];
@@ -276,6 +311,8 @@ export function dbosRuntime(): EngineRuntime {
           workflowId,
           parentId: row?.parent_workflow_id ?? undefined,
           startedAt: new Date(Number(row?.created_at)),
+          priority: row?.priority || DEFAULT_PRIORITY,
+          now: () => DBOS.now(),
           step: (step, stepArgs, opts = {}) => {
             const pool = opts.pool ? pools[opts.pool] : undefined;
             if (opts.pool && !pool) throw new Error(`пул "${opts.pool}" не объявлен в AppDefinition.pools модуля ${def.app}`);
@@ -296,7 +333,7 @@ export function dbosRuntime(): EngineRuntime {
                 await sleepMs(100);
               }
             };
-            return DBOS.runStep(() => attempts(def.activities[step]!, stepArgs, opts, pool, alive), {
+            return DBOS.runStep(() => attempts(def.activities[step]!, stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority), {
               name: step,
               retriesAllowed: false,
             }).catch((e) => {
@@ -304,10 +341,10 @@ export function dbosRuntime(): EngineRuntime {
             }) as Promise<never>;
           },
           child: async (target, childArgs, opts) =>
-            waitChild(await enqueue(target, childArgs, opts, opts.onExisting === "reject"), opts.id),
+            waitChild(await enqueue(target, childArgs, opts, opts.onExisting === "reject", ctx.priority), opts.id),
           async startChild(target, childArgs, opts) {
             // Процесс DBOS не привязан к родителю: живёт сам, как ABANDON у Temporal.
-            const h = await enqueue(target, childArgs, opts, true);
+            const h = await enqueue(target, childArgs, opts, true, ctx.priority);
             return { id: opts.id, result: () => waitChild(h, opts.id) };
           },
           sleep: (ms) => DBOS.sleep(ms),
@@ -398,7 +435,7 @@ export async function dbosClient(): Promise<EngineClient> {
       await client.cancelWorkflow(id);
     },
   });
-  return {
+  const self: EngineClient = {
     async start(target, args, opts) {
       const h = await client.enqueue(
         {
@@ -407,12 +444,24 @@ export async function dbosClient(): Promise<EngineClient> {
           workflowID: opts.id,
           applicationName: target.app,
           ...(opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {}),
+          // Без приоритета DBOS ставит 0 — впереди всех; порт по умолчанию 3, как Temporal.
+          priority: checkPriority(opts.priority) ?? DEFAULT_PRIORITY,
         },
         ...args,
       );
       return wrap(h.workflowID);
     },
+    async signalWithStart<T>(target: FlowRef, args: unknown[], opts: StartOptions, topic: string, value: unknown) {
+      // Не атомарно, но без потерь: сигнал ждёт в очереди темы, пока процесс до него дойдёт.
+      const h = await self.start<T>(target, args, opts);
+      // id завершённого DBOS не переиспользует: сигнал ушёл бы в никуда.
+      if (FINISHED.has((await status(h.id))?.status ?? ""))
+        throw new FlowError(`процесс ${h.id} уже завершён — id не переиспользуется`, { reason: "already-started" });
+      await client.send(h.id, value, topic);
+      return h;
+    },
     handle: (id) => wrap(id),
     close: () => client.destroy(),
   };
+  return self;
 }