@iworkflow/dbos 0.7.0 → 0.9.0

package/dist/index.js

@@ -4,6 +4,7 @@ import {
   stepScope,
   checkLimits,
   checkPriority,
+  plainAttrs,
   DEFAULT_PRIORITY,
   exitSignal,
   Failure,
@@ -70,7 +71,7 @@ function stepKey() {
   const wf = DBOS.workflowID;
   const step = DBOS.stepID;
   if (!wf || step === undefined)
-    throw new Error("heartbeat вне шага DBOS");
+    throw new Error("вызов вне шага DBOS");
   return [wf, step];
 }
 var typeOf = (e) => e instanceof Failure ? e.type : e instanceof Error ? e.name : "Error";
@@ -128,12 +129,16 @@ class Semaphore {
 class AttemptTimeout extends Error {
 }
 var sleepMs = (ms) => new Promise((r) => setTimeout(r, ms));
-async function withTimeout(p, ms) {
+async function withTimeout(p, ms, abort) {
   let timer;
   try {
     return await Promise.race([
       p,
-      new Promise((_, reject) => timer = setTimeout(() => reject(new AttemptTimeout(`попытка дольше ${ms} мс`)), ms))
+      new Promise((_, reject) => timer = setTimeout(() => {
+        const e = new AttemptTimeout(`попытка дольше ${ms} мс`);
+        abort.abort(e);
+        reject(e);
+      }, ms))
     ]);
   } finally {
     clearTimeout(timer);
@@ -145,7 +150,10 @@ async function attempts(fn, args, opts, pool, alive, priority, runtime) {
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1;; n++) {
     try {
-      const attempt = () => stepScope(alsScope).run(runtime(n), () => withTimeout(fn(...args), opts.timeoutMs ?? 60000));
+      const attempt = () => {
+        const abort = new AbortController;
+        return stepScope(alsScope).run(runtime(n, abort.signal), () => withTimeout(fn(...args), opts.timeoutMs ?? 60000, abort));
+      };
       return await (pool ? pool.run(attempt, priority) : attempt());
     } catch (e) {
       const stop = e instanceof Failure && e.nonRetryable || (opts.nonRetryableTypes ?? []).includes(typeOf(e));
@@ -193,7 +201,7 @@ function dbosRuntime() {
     pool = new Pool({ connectionString: sysDb(), max: 2 });
     const db = pool;
     const patches = patchBook(db, def.app, def.patches ?? []);
-    const stepRuntime = (n) => ({
+    const stepRuntime = (n, signal) => ({
       async heartbeat(details) {
         await db.query(`INSERT INTO iwf.heartbeat (workflow_id, step_id, details) VALUES ($1, $2, $3)
            ON CONFLICT (workflow_id, step_id) DO UPDATE SET details = EXCLUDED.details, at = now()`, [...stepKey(), JSON.stringify(details ?? null)]);
@@ -202,7 +210,12 @@ function dbosRuntime() {
         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: () => n
+      attempt: () => n,
+      info: () => {
+        const [wf, step] = stepKey();
+        return { workflowId: wf, runId: wf, stepId: String(step) };
+      },
+      signal: () => signal
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
     const main = def.maxConcurrentSteps ? new Semaphore(def.maxConcurrentSteps) : undefined;
@@ -271,6 +284,10 @@ function dbosRuntime() {
               throw new FlowError(`процесса ${target} нет или он завершён`, { reason: "not-found" });
             await DBOS.send(target, value, topic);
           },
+          log: async (level, message, attrs) => {
+            const plain = plainAttrs(attrs);
+            console[level](message, ...plain ? [plain] : []);
+          },
           setState: (key, value) => DBOS.setEvent(key, value),
           patched: (id) => patches.patched(workflowId, id),
           deprecatePatch: async () => {}
@@ -351,7 +368,7 @@ async function dbosClient() {
         applicationName: target.app,
         ...opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {},
         priority: checkPriority(opts.priority) ?? DEFAULT_PRIORITY,
-        ...opts.onExisting === "reject" ? { workflowIDReusePolicy: "reject" } : {}
+        ...opts.onExisting === "reject" || opts.reuseClosedId ? { workflowIDReusePolicy: "reject" } : {}
       }, ...args).catch(alreadyStarted(opts.id));
       return wrap(h.workflowID);
     },

package/package.json

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

package/src/index.ts

@@ -6,6 +6,7 @@ import {
   type StepRuntime,
   checkLimits,
   checkPriority,
+  plainAttrs,
   DEFAULT_PRIORITY,
   exitSignal,
   Failure,
@@ -98,7 +99,7 @@ function patchBook(db: Pool, app: string, declared: string[]) {
 function stepKey(): [string, number] {
   const wf = DBOS.workflowID;
   const step = DBOS.stepID;
-  if (!wf || step === undefined) throw new Error("heartbeat вне шага DBOS");
+  if (!wf || step === undefined) throw new Error("вызов вне шага DBOS");
   return [wf, step];
 }
 
@@ -170,12 +171,17 @@ const sleepMs = (ms: number) => new Promise((r) => setTimeout(r, ms));
 
 
 /** Попытка, урезанная по сроку: брошенная продолжает идти в фоне, её итог отбрасывается. */
-async function withTimeout<T>(p: Promise<T>, ms: number): Promise<T> {
+async function withTimeout<T>(p: Promise<T>, ms: number, abort: AbortController): Promise<T> {
   let timer: ReturnType<typeof setTimeout> | undefined;
   try {
     return await Promise.race([
       p,
-      new Promise<never>((_, reject) => (timer = setTimeout(() => reject(new AttemptTimeout(`попытка дольше ${ms} мс`)), ms))),
+      new Promise<never>((_, reject) => (timer = setTimeout(() => {
+        const e = new AttemptTimeout(`попытка дольше ${ms} мс`);
+        // Брошенная попытка видит отмену через stepSignal() и может остановиться сама.
+        abort.abort(e);
+        reject(e);
+      }, ms))),
     ]);
   } finally {
     clearTimeout(timer);
@@ -190,14 +196,17 @@ async function attempts(
   pool: Semaphore | undefined,
   alive: () => Promise<boolean>,
   priority: number | undefined,
-  runtime: (n: number) => StepRuntime,
+  runtime: (n: number, signal: AbortSignal) => StepRuntime,
 ) {
   const max = opts.attempts ?? 3;
   const started = Date.now();
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1; ; n++) {
     try {
-      const attempt = () => stepScope(alsScope).run(runtime(n), () => withTimeout(fn(...args), opts.timeoutMs ?? 60_000));
+      const attempt = () => {
+        const abort = new AbortController();
+        return stepScope(alsScope).run(runtime(n, abort.signal), () => withTimeout(fn(...args), opts.timeoutMs ?? 60_000, abort));
+      };
       return await (pool ? pool.run(attempt, priority) : attempt());
     } catch (e) {
       const stop = (e instanceof Failure && e.nonRetryable) || (opts.nonRetryableTypes ?? []).includes(typeOf(e));
@@ -255,7 +264,7 @@ export function dbosRuntime(): EngineRuntime {
     const db = pool;
     const patches = patchBook(db, def.app, def.patches ?? []);
     // Рантайм попытки шага: прогресс — в iwf.heartbeat по (процесс, шаг), номер — из цикла повторов.
-    const stepRuntime = (n: number): StepRuntime => ({
+    const stepRuntime = (n: number, signal: AbortSignal): StepRuntime => ({
       async heartbeat(details) {
         await db.query(
           `INSERT INTO iwf.heartbeat (workflow_id, step_id, details) VALUES ($1, $2, $3)
@@ -268,6 +277,12 @@ export function dbosRuntime(): EngineRuntime {
         return r.rows[0]?.details ?? undefined;
       },
       attempt: () => n,
+      // id DBOS не переиспользуется: запуск у процесса один.
+      info: () => {
+        const [wf, step] = stepKey();
+        return { workflowId: wf, runId: wf, stepId: String(step) };
+      },
+      signal: () => signal,
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
     // Шаги вне пулов — под общим пределом модуля, как maxConcurrentActivityTaskExecutions у Temporal.
@@ -363,6 +378,12 @@ export function dbosRuntime(): EngineRuntime {
               throw new FlowError(`процесса ${target} нет или он завершён`, { reason: "not-found" });
             await DBOS.send(target, value, topic);
           },
+          // Не шагом: строка журнала не сдвигает нумерацию шагов. Цена — повтор строки при восстановлении после рестарта.
+          log: async (level, message, attrs) => {
+            const plain = plainAttrs(attrs);
+            // console, а не DBOS.logger: у того logLevel "warn" — info молча пропал бы.
+            console[level](message, ...(plain ? [plain] : []));
+          },
           setState: (key, value) => DBOS.setEvent(key, value),
           patched: (id) => patches.patched(workflowId, id),
           // Старых процессов нет — ветка всегда новая; вызов можно удалять.
@@ -454,13 +475,13 @@ export async function dbosClient(): Promise<EngineClient> {
           ...(opts.timeoutMs ? { workflowTimeoutMS: opts.timeoutMs } : {}),
           // Без приоритета DBOS ставит 0 — впереди всех; порт по умолчанию 3, как Temporal.
           priority: checkPriority(opts.priority) ?? DEFAULT_PRIORITY,
-          ...(opts.onExisting === "reject" ? { workflowIDReusePolicy: "reject" as const } : {}),
+          ...(opts.onExisting === "reject" || opts.reuseClosedId ? { workflowIDReusePolicy: "reject" as const } : {}),
         },
         ...args,
       ).catch(alreadyStarted(opts.id));
       return wrap(h.workflowID);
     },
-    async signalWithStart<T>(target: FlowRef, args: unknown[], opts: Omit<StartOptions, "onExisting">, topic: string, value: unknown) {
+    async signalWithStart<T>(target: FlowRef, args: unknown[], opts: Omit<StartOptions, "onExisting" | "reuseClosedId">, topic: string, value: unknown) {
       // Не атомарно, но без потерь: сигнал ждёт в очереди темы, пока процесс до него дойдёт.
       const h = await self.start<T>(target, args, opts);
       // id завершённого DBOS не переиспользует: сигнал ушёл бы в никуда.