@iworkflow/temporal 0.6.0 → 0.7.0

package/README.md

@@ -11,6 +11,8 @@ Temporal для `@iworkflow/core`. Peer: `@temporalio/{client,common,worker,work
 - `temporalActivities(activities)` — шаги порта для своего `Worker.create` (слив старой очереди, тестовый
   воркер): `Failure` → `ApplicationFailure`, работают `heartbeat` и `stepAttempt`. Шаги без неё
   в своём воркере `heartbeat`/`stepAttempt` не видят — с 0.6.0 рантайм шага ставится на время шага.
+- `temporalStep(fn)` — тест шага без воркера: `new MockActivityEnvironment().run(() => temporalStep(() => acts.send(x)))`;
+  `acts` — сырые шаги (не результат `temporalActivities`), отказ остаётся `Failure`; `@temporalio/testing` ставит сам модуль.
 - `@iworkflow/temporal/workflow` — только для входа песочницы модуля:
   `export const outreach = temporalFlow(flows.outreach, ["send-twice"])`.
 

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import { type Activity, type EngineClient, type EngineRuntime } from "@iworkflow/core";
 import { type TemporalOptions } from "./connection";
 export type { TemporalOptions };
+/** Один вызов шага в рантайме Temporal без обёртки отказов — для тестов в MockActivityEnvironment. */
+export declare const temporalStep: <T>(fn: () => T) => T;
 /**
  * Шаги порта для своего Worker.create (слив старой очереди, тестовый воркер): Failure доезжает
  * как ApplicationFailure, heartbeat и stepAttempt работают. temporalRuntime делает это сам.

package/dist/index.js

@@ -4,6 +4,7 @@ import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
   stepScope,
+  checkLimits,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -142,13 +143,13 @@ var TEMPORAL_STEP = {
   lastHeartbeat: async () => Context.current().info.heartbeatDetails,
   attempt: () => Context.current().info.attempt
 };
+var temporalStep = (fn) => stepScope(alsScope).run(TEMPORAL_STEP, fn);
 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));
+        return await temporalStep(() => fn(...args));
       } catch (e) {
         throw toTemporal(e, false);
       }
@@ -167,8 +168,14 @@ function temporalRuntime(workflowsPath, opts = {}) {
     async start(def) {
       if (starting)
         throw new Error("воркер уже запущен");
-      starting = true;
       exit.arm();
+      try {
+        checkLimits(def);
+      } catch (e) {
+        exit.reject(e);
+        throw e;
+      }
+      starting = true;
       stopping = false;
       let c;
       try {
@@ -183,7 +190,15 @@ function temporalRuntime(workflowsPath, opts = {}) {
         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 })];
+        workers = [
+          await Worker.create({
+            ...base,
+            taskQueue: def.app,
+            ...code,
+            activities,
+            ...def.maxConcurrentSteps ? { maxConcurrentActivityTaskExecutions: def.maxConcurrentSteps } : {}
+          })
+        ];
         for (const [pool, limit] of Object.entries(def.pools ?? {}))
           workers.push(await Worker.create({
             ...base,
@@ -267,7 +282,12 @@ async function temporalClient(opts = {}) {
   return {
     async start(target, args, o) {
       await ready();
-      const h = await client.workflow.start(target.flow, { ...startOptions(target, args, o), workflowIdConflictPolicy: "USE_EXISTING" });
+      const h = await client.workflow.start(target.flow, {
+        ...startOptions(target, args, o),
+        ...o.onExisting === "reject" ? { workflowIdConflictPolicy: "FAIL", workflowIdReusePolicy: "REJECT_DUPLICATE" } : { workflowIdConflictPolicy: "USE_EXISTING" }
+      }).catch((e) => {
+        throw fromTemporal(e);
+      });
       return wrap(h, ready);
     },
     async signalWithStart(target, args, o, topic, value) {
@@ -286,5 +306,6 @@ async function temporalClient(opts = {}) {
 export {
   temporalActivities,
   temporalClient,
-  temporalRuntime
+  temporalRuntime,
+  temporalStep
 };

package/dist/workflow.js

@@ -126,8 +126,10 @@ function temporalFlow(flow, patches = []) {
       step: (name, stepArgs, opts) => activitiesWith(opts)[name](...stepArgs).catch(rethrow),
       child: (target, childArgs, opts) => executeChild(target.flow, childOptions(target.app, childArgs, opts)).catch(rethrow),
       async startChild(target, childArgs, opts) {
+        const { reuseClosedId, ...rest } = opts;
         const h = await startChild(target.flow, {
-          ...childOptions(target.app, childArgs, { ...opts, onExisting: "reject" }),
+          ...childOptions(target.app, childArgs, { ...rest, onExisting: "reject" }),
+          ...reuseClosedId ? { workflowIdReusePolicy: "ALLOW_DUPLICATE" } : {},
           parentClosePolicy: ParentClosePolicy.ABANDON
         }).catch(rethrow);
         return { id: opts.id, result: () => h.result().catch(rethrow) };

package/package.json

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

package/src/index.ts

@@ -5,6 +5,7 @@ import { NativeConnection, Worker } from "@temporalio/worker";
 import {
   stepScope,
   type StepRuntime,
+  checkLimits,
   checkPriority,
   DEFAULT_PRIORITY,
   exitSignal,
@@ -19,7 +20,7 @@ import {
   type StartOptions,
 } from "@iworkflow/core";
 import { address, connectOptions, namespace, renewApiKey, type TemporalOptions } from "./connection";
-import { cause, toTemporal } from "./failure";
+import { cause, fromTemporal, toTemporal } from "./failure";
 import { alsScope } from "./scope";
 
 export type { TemporalOptions };
@@ -79,18 +80,21 @@ const TEMPORAL_STEP: StepRuntime = {
   attempt: () => Context.current().info.attempt,
 };
 
+/** Один вызов шага в рантайме Temporal без обёртки отказов — для тестов в MockActivityEnvironment. */
+// Область берётся при вызове, а не при импорте: пакет sideEffects: false.
+export const temporalStep = <T>(fn: () => T): T => stepScope(alsScope).run(TEMPORAL_STEP, fn);
+
 /**
  * Шаги порта для своего 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 scope.run(TEMPORAL_STEP, () => fn(...args));
+          return await temporalStep(() => fn(...args));
         } catch (e) {
           throw toTemporal(e, false);
         }
@@ -117,8 +121,14 @@ export function temporalRuntime(
   return {
     async start(def: AppDefinition) {
       if (starting) throw new Error("воркер уже запущен");
-      starting = true;
       exit.arm();
+      try {
+        checkLimits(def);
+      } catch (e) {
+        exit.reject(e);
+        throw e;
+      }
+      starting = true;
       stopping = false;
       let c: NativeConnection;
       try {
@@ -134,7 +144,15 @@ export function temporalRuntime(
         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 })];
+        workers = [
+          await Worker.create({
+            ...base,
+            taskQueue: def.app,
+            ...code,
+            activities,
+            ...(def.maxConcurrentSteps ? { maxConcurrentActivityTaskExecutions: def.maxConcurrentSteps } : {}),
+          }),
+        ];
         // Пул — своя очередь с пределом одновременных шагов в этом процессе.
         for (const [pool, limit] of Object.entries(def.pools ?? {}))
           workers.push(
@@ -229,7 +247,16 @@ export async function temporalClient(opts: TemporalOptions & { lazy?: boolean }
   return {
     async start(target, args, o) {
       await ready();
-      const h = await client.workflow.start(target.flow, { ...startOptions(target, args, o), workflowIdConflictPolicy: "USE_EXISTING" });
+      const h = await client.workflow
+        .start(target.flow, {
+          ...startOptions(target, args, o),
+          ...(o.onExisting === "reject"
+            ? { workflowIdConflictPolicy: "FAIL" as const, workflowIdReusePolicy: "REJECT_DUPLICATE" as const }
+            : { workflowIdConflictPolicy: "USE_EXISTING" as const }),
+        })
+        .catch((e) => {
+          throw fromTemporal(e);
+        });
       return wrap(h, ready);
     },
     async signalWithStart(target, args, o, topic, value) {

package/src/workflow.ts

@@ -94,9 +94,11 @@ export function temporalFlow(flow: Flow, patches: string[] = []) {
       child: (target, childArgs, opts) =>
         executeChild(target.flow, childOptions(target.app, childArgs, opts)).catch(rethrow) as Promise<never>,
       async startChild(target, childArgs, opts) {
-        // REJECT_DUPLICATE: завершённый id тоже занят — как у DBOS, где id не переиспользуется.
+        // REJECT_DUPLICATE: завершённый id тоже занят, как у DBOS; reuseClosedId — ALLOW_DUPLICATE, новый запуск.
+        const { reuseClosedId, ...rest } = opts;
         const h = await startChild(target.flow, {
-          ...childOptions(target.app, childArgs, { ...opts, onExisting: "reject" }),
+          ...childOptions(target.app, childArgs, { ...rest, onExisting: "reject" }),
+          ...(reuseClosedId ? { workflowIdReusePolicy: "ALLOW_DUPLICATE" as const } : {}),
           parentClosePolicy: ParentClosePolicy.ABANDON,
         }).catch(rethrow);
         return { id: opts.id, result: () => h.result().catch(rethrow) as Promise<never> };