@iworkflow/temporal 0.5.0 → 0.6.0

package/README.md

@@ -1,9 +1,16 @@
 # @iworkflow/temporal
 
-Temporal для `@iworkflow/core`. Peer: `@temporalio/{client,worker,workflow,activity}` ^1.24.
+Temporal для `@iworkflow/core`. Peer: `@temporalio/{client,common,worker,workflow,activity}` ^1.24.
+
+Модуль объявляет в своих зависимостях **все пять** peer, даже если сам импортирует не все: сборка
+сервера с `external: ["@temporalio/*"]` их не вкладывает, и без `@temporalio/common` под падает
+на старте с `Cannot find module`.
 
 - `temporalRuntime(workflowsPath, opts?).start(def)` — воркер на task queue `def.app`; `opts.workflowBundlePath` — готовый бандл прод-сборки.
 - `temporalClient(opts?)` — старт, сигнал, query по id.
+- `temporalActivities(activities)` — шаги порта для своего `Worker.create` (слив старой очереди, тестовый
+  воркер): `Failure` → `ApplicationFailure`, работают `heartbeat` и `stepAttempt`. Шаги без неё
+  в своём воркере `heartbeat`/`stepAttempt` не видят — с 0.6.0 рантайм шага ставится на время шага.
 - `@iworkflow/temporal/workflow` — только для входа песочницы модуля:
   `export const outreach = temporalFlow(flows.outreach, ["send-twice"])`.
 

package/dist/index.d.ts

@@ -1,6 +1,11 @@
-import { type EngineClient, type EngineRuntime } from "@iworkflow/core";
+import { type Activity, type EngineClient, type EngineRuntime } from "@iworkflow/core";
 import { type TemporalOptions } from "./connection";
 export type { TemporalOptions };
+/**
+ * Шаги порта для своего Worker.create (слив старой очереди, тестовый воркер): Failure доезжает
+ * как ApplicationFailure, heartbeat и stepAttempt работают. temporalRuntime делает это сам.
+ */
+export declare function temporalActivities<T extends Record<string, Activity>>(activities: T): T;
 /**
  * workflowsPath — вход песочницы модуля: temporalFlow(...) на каждый процесс, имя экспорта = имя процесса.
  * workflowBundlePath — готовый бандл того же входа (прод-сборка); с ним воркер не собирает код сам.

package/dist/index.js

@@ -3,7 +3,7 @@ import { Client, Connection, WorkflowFailedError, WorkflowNotFoundError } from "
 import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
-  bindStepRuntime,
+  stepScope,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -41,6 +41,7 @@ var connectOptions = async (o) => ({
 import {
   ActivityFailure,
   ApplicationFailure,
+  ApplicationFailureCategory,
   ChildWorkflowFailure,
   TerminatedFailure,
   TimeoutFailure,
@@ -77,13 +78,21 @@ function toTemporal(e, nonRetryable) {
       type: e.type,
       details: [e.details],
       nonRetryable: nonRetryable || e.nonRetryable,
-      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}
+      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {},
+      ...e.benign && !nonRetryable ? { category: ApplicationFailureCategory.BENIGN } : {}
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });
   return e;
 }
 
+// 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 SIGNAL = "iwf.signal";
 var QUERY = "iwf.query";
@@ -128,16 +137,24 @@ var wrap = (h, ready = async () => {}) => ({
     await h.terminate(reason).catch(notFound(h.workflowId));
   }
 });
-var withFailures = (activities) => Object.fromEntries(Object.entries(activities).map(([name, fn]) => [
-  name,
-  async (...args) => {
-    try {
-      return await fn(...args);
-    } catch (e) {
-      throw toTemporal(e, false);
+var TEMPORAL_STEP = {
+  heartbeat: async (details) => Context.current().heartbeat(details),
+  lastHeartbeat: async () => Context.current().info.heartbeatDetails,
+  attempt: () => Context.current().info.attempt
+};
+function temporalActivities(activities) {
+  const scope = stepScope(alsScope);
+  return Object.fromEntries(Object.entries(activities).map(([name, fn]) => [
+    name,
+    async (...args) => {
+      try {
+        return await scope.run(TEMPORAL_STEP, () => fn(...args));
+      } catch (e) {
+        throw toTemporal(e, false);
+      }
     }
-  }
-]));
+  ]));
+}
 function temporalRuntime(workflowsPath, opts = {}) {
   let workers = [];
   let running = [];
@@ -153,11 +170,6 @@ function temporalRuntime(workflowsPath, opts = {}) {
       starting = true;
       exit.arm();
       stopping = false;
-      bindStepRuntime({
-        heartbeat: async (details) => Context.current().heartbeat(details),
-        lastHeartbeat: async () => Context.current().info.heartbeatDetails,
-        attempt: () => Context.current().info.attempt
-      });
       let c;
       try {
         c = conn = await NativeConnection.connect(await connectOptions(opts));
@@ -168,7 +180,7 @@ function temporalRuntime(workflowsPath, opts = {}) {
       }
       stopRenew = renewApiKey(opts, (t) => c.setApiKey(t));
       try {
-        const activities = withFailures(def.activities);
+        const activities = temporalActivities(def.activities);
         const base = { connection: c, namespace: namespace(opts), ...opts.plugins ? { plugins: opts.plugins } : {} };
         const code = opts.workflowBundlePath ? { workflowBundle: { codePath: opts.workflowBundlePath } } : { workflowsPath };
         workers = [await Worker.create({ ...base, taskQueue: def.app, ...code, activities })];
@@ -272,6 +284,7 @@ async function temporalClient(opts = {}) {
   };
 }
 export {
+  temporalActivities,
   temporalClient,
   temporalRuntime
 };

package/dist/scope.d.ts

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

package/dist/workflow.js

@@ -21,6 +21,7 @@ import { checkPriority, DEFAULT_PRIORITY, FlowError as FlowError2 } from "@iwork
 import {
   ActivityFailure,
   ApplicationFailure,
+  ApplicationFailureCategory,
   ChildWorkflowFailure,
   TerminatedFailure,
   TimeoutFailure,
@@ -57,7 +58,8 @@ function toTemporal(e, nonRetryable) {
       type: e.type,
       details: [e.details],
       nonRetryable: nonRetryable || e.nonRetryable,
-      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}
+      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {},
+      ...e.benign && !nonRetryable ? { category: ApplicationFailureCategory.BENIGN } : {}
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iworkflow/temporal",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Temporal adapter for @iworkflow/core",
   "keywords": [
     "workflow",
@@ -41,7 +41,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@iworkflow/core": "^0.5.0"
+    "@iworkflow/core": "^0.6.0"
   },
   "peerDependencies": {
     "@temporalio/activity": "^1.24.0",

package/src/failure.ts

@@ -2,6 +2,7 @@
 import {
   ActivityFailure,
   ApplicationFailure,
+  ApplicationFailureCategory,
   ChildWorkflowFailure,
   TerminatedFailure,
   TimeoutFailure,
@@ -43,6 +44,8 @@ export function toTemporal(e: unknown, nonRetryable: boolean): unknown {
       nonRetryable: nonRetryable || e.nonRetryable,
       // 0 сервер считает «не задано» и берёт паузу политики; 1 мс — «сразу», как у DBOS.
       ...(e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}),
+      // BENIGN — только отказу шага: отказ процесса целиком штатным не бывает.
+      ...(e.benign && !nonRetryable ? { category: ApplicationFailureCategory.BENIGN } : {}),
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });

package/src/index.ts

@@ -3,7 +3,8 @@ import { Client, Connection, WorkflowFailedError, WorkflowNotFoundError, type Wo
 import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
-  bindStepRuntime,
+  stepScope,
+  type StepRuntime,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -19,6 +20,7 @@ import {
 } from "@iworkflow/core";
 import { address, connectOptions, namespace, renewApiKey, type TemporalOptions } from "./connection";
 import { cause, toTemporal } from "./failure";
+import { alsScope } from "./scope";
 
 export type { TemporalOptions };
 
@@ -70,20 +72,32 @@ const wrap = <T>(h: WorkflowHandle, ready: () => Promise<unknown> = async () =>
   },
 });
 
-/** Шаги отдают Failure как ApplicationFailure: тип, детали и nonRetryable доезжают до процесса. */
-const withFailures = (activities: Record<string, Activity>) =>
-  Object.fromEntries(
+/** Рантайм шага Temporal: всё из контекста активности. */
+const TEMPORAL_STEP: StepRuntime = {
+  heartbeat: async (details) => Context.current().heartbeat(details),
+  lastHeartbeat: async () => Context.current().info.heartbeatDetails,
+  attempt: () => Context.current().info.attempt,
+};
+
+/**
+ * Шаги порта для своего Worker.create (слив старой очереди, тестовый воркер): Failure доезжает
+ * как ApplicationFailure, heartbeat и stepAttempt работают. temporalRuntime делает это сам.
+ */
+export function temporalActivities<T extends Record<string, Activity>>(activities: T): T {
+  const scope = stepScope(alsScope);
+  return Object.fromEntries(
     Object.entries(activities).map(([name, fn]) => [
       name,
       async (...args: unknown[]) => {
         try {
-          return await fn(...args);
+          return await scope.run(TEMPORAL_STEP, () => fn(...args));
         } catch (e) {
           throw toTemporal(e, false);
         }
       },
     ]),
-  );
+  ) as T;
+}
 
 /**
  * workflowsPath — вход песочницы модуля: temporalFlow(...) на каждый процесс, имя экспорта = имя процесса.
@@ -106,11 +120,6 @@ export function temporalRuntime(
       starting = true;
       exit.arm();
       stopping = false;
-      bindStepRuntime({
-        heartbeat: async (details) => Context.current().heartbeat(details),
-        lastHeartbeat: async () => Context.current().info.heartbeatDetails,
-        attempt: () => Context.current().info.attempt,
-      });
       let c: NativeConnection;
       try {
         c = conn = await NativeConnection.connect(await connectOptions(opts));
@@ -122,7 +131,7 @@ export function temporalRuntime(
       stopRenew = renewApiKey(opts, (t) => c.setApiKey(t));
       // Воркер не создался (нет бандла, namespace) — соединение и таймер токена закрываются.
       try {
-        const activities = withFailures(def.activities);
+        const activities = temporalActivities(def.activities);
         const base = { connection: c, namespace: namespace(opts), ...(opts.plugins ? { plugins: opts.plugins } : {}) };
         const code = opts.workflowBundlePath ? { workflowBundle: { codePath: opts.workflowBundlePath } } : { workflowsPath };
         workers = [await Worker.create({ ...base, taskQueue: def.app, ...code, activities })];

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() };
+};