@iworkflow/dbos 0.5.0 → 0.6.0

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 import { DBOS, DBOSClient, Error as DBOSErrors } from "@dbos-inc/dbos-sdk";
 import {
-  bindStepRuntime,
+  stepScope,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -9,8 +9,16 @@ import {
   FlowError,
   isFlowError
 } from "@iworkflow/core";
-import { AsyncLocalStorage } from "node:async_hooks";
 import { Pool } from "pg";
+
+// src/scope.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var alsScope = () => {
+  const als = new AsyncLocalStorage;
+  return { run: (rt, fn) => als.run(rt, fn), current: () => als.getStore() };
+};
+
+// src/index.ts
 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";
 var HEARTBEAT_DDL = [
@@ -119,7 +127,7 @@ class Semaphore {
 class AttemptTimeout extends Error {
 }
 var sleepMs = (ms) => new Promise((r) => setTimeout(r, ms));
-var attemptNo = new AsyncLocalStorage;
+var scope = stepScope(alsScope);
 async function withTimeout(p, ms) {
   let timer;
   try {
@@ -131,13 +139,13 @@ async function withTimeout(p, ms) {
     clearTimeout(timer);
   }
 }
-async function attempts(fn, args, opts, pool, alive, priority) {
+async function attempts(fn, args, opts, pool, alive, priority, runtime) {
   const max = opts.attempts ?? 3;
   const started = Date.now();
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1;; n++) {
     try {
-      const attempt = () => attemptNo.run(n, () => withTimeout(fn(...args), opts.timeoutMs ?? 60000));
+      const attempt = () => scope.run(runtime(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));
@@ -184,7 +192,7 @@ function dbosRuntime() {
     pool = new Pool({ connectionString: sysDb(), max: 2 });
     const db = pool;
     const patches = patchBook(db, def.app, def.patches ?? []);
-    bindStepRuntime({
+    const stepRuntime = (n) => ({
       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)]);
@@ -193,12 +201,7 @@ 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: () => {
-        const n = attemptNo.getStore();
-        if (n === undefined)
-          throw new Error("stepAttempt вне шага");
-        return n;
-      }
+      attempt: () => n
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
     const enqueue = (target, args, opts, reject, priority) => DBOS.enqueueWorkflowWithOptions({
@@ -246,7 +249,7 @@ function dbosRuntime() {
                 await sleepMs(100);
               }
             };
-            return DBOS.runStep(() => attempts(def.activities[step], stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority), {
+            return DBOS.runStep(() => attempts(def.activities[step], stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority, stepRuntime), {
               name: step,
               retriesAllowed: false
             }).catch((e) => {

package/dist/scope.d.ts

@@ -0,0 +1,2 @@
+import type { StepScope } from "@iworkflow/core";
+export declare const alsScope: () => StepScope;

package/package.json

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

package/src/index.ts

@@ -2,7 +2,8 @@
 // Дочерний процесс в чужом модуле — enqueueWorkflowWithOptions по имени, без ссылки на функцию.
 import { DBOS, DBOSClient, Error as DBOSErrors, type WorkflowStatus } from "@dbos-inc/dbos-sdk";
 import {
-  bindStepRuntime,
+  stepScope,
+  type StepRuntime,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -21,8 +22,8 @@ import {
   type StartOptions,
   type StepOptions,
 } from "@iworkflow/core";
-import { AsyncLocalStorage } from "node:async_hooks";
 import { Pool } from "pg";
+import { alsScope } from "./scope";
 
 // Ожидание результата дочернего процесса — опрос базы, по умолчанию раз в секунду: это и есть
 // задержка каждого перехода между модулями. DBOS_RESULT_POLL_MS уменьшает её ценой запросов к базе.
@@ -165,8 +166,7 @@ class AttemptTimeout extends Error {}
 
 const sleepMs = (ms: number) => new Promise((r) => setTimeout(r, ms));
 
-/** Номер идущей попытки шага — для stepAttempt(). */
-const attemptNo = new AsyncLocalStorage<number>();
+const scope = stepScope(alsScope);
 
 /** Попытка, урезанная по сроку: брошенная продолжает идти в фоне, её итог отбрасывается. */
 async function withTimeout<T>(p: Promise<T>, ms: number): Promise<T> {
@@ -189,13 +189,14 @@ async function attempts(
   pool: Semaphore | undefined,
   alive: () => Promise<boolean>,
   priority: number | undefined,
+  runtime: (n: number) => StepRuntime,
 ) {
   const max = opts.attempts ?? 3;
   const started = Date.now();
   let interval = opts.retryIntervalMs ?? 200;
   for (let n = 1; ; n++) {
     try {
-      const attempt = () => attemptNo.run(n, () => withTimeout(fn(...args), opts.timeoutMs ?? 60_000));
+      const attempt = () => scope.run(runtime(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));
@@ -251,7 +252,8 @@ export function dbosRuntime(): EngineRuntime {
     pool = new Pool({ connectionString: sysDb(), max: 2 });
     const db = pool;
     const patches = patchBook(db, def.app, def.patches ?? []);
-    bindStepRuntime({
+    // Рантайм попытки шага: прогресс — в iwf.heartbeat по (процесс, шаг), номер — из цикла повторов.
+    const stepRuntime = (n: number): StepRuntime => ({
       async heartbeat(details) {
         await db.query(
           `INSERT INTO iwf.heartbeat (workflow_id, step_id, details) VALUES ($1, $2, $3)
@@ -263,11 +265,7 @@ 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;
-      },
+      attempt: () => n,
     });
     const pools = Object.fromEntries(Object.entries(def.pools ?? {}).map(([p, n]) => [p, new Semaphore(n)]));
     const enqueue = (
@@ -333,7 +331,7 @@ export function dbosRuntime(): EngineRuntime {
                 await sleepMs(100);
               }
             };
-            return DBOS.runStep(() => attempts(def.activities[step]!, stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority), {
+            return DBOS.runStep(() => attempts(def.activities[step]!, stepArgs, opts, pool, alive, checkPriority(opts.priority) ?? ctx.priority, stepRuntime), {
               name: step,
               retriesAllowed: false,
             }).catch((e) => {

package/src/scope.ts

@@ -0,0 +1,8 @@
+// Область шага на AsyncLocalStorage: stepScope ядра берёт её у первого адаптера процесса.
+import { AsyncLocalStorage } from "node:async_hooks";
+import type { StepRuntime, StepScope } from "@iworkflow/core";
+
+export const alsScope = (): StepScope => {
+  const als = new AsyncLocalStorage<StepRuntime>();
+  return { run: (rt, fn) => als.run(rt, fn), current: () => als.getStore() };
+};