@iworkflow/temporal 0.6.1 → 0.8.0

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,
@@ -140,7 +141,15 @@ var wrap = (h, ready = async () => {}) => ({
 var TEMPORAL_STEP = {
   heartbeat: async (details) => Context.current().heartbeat(details),
   lastHeartbeat: async () => Context.current().info.heartbeatDetails,
-  attempt: () => Context.current().info.attempt
+  attempt: () => Context.current().info.attempt,
+  info: () => {
+    const { workflowExecution, activityId } = Context.current().info;
+    const { workflowId, runId } = workflowExecution ?? {};
+    if (!workflowId || !runId)
+      throw new Error("stepInfo: шаг вне процесса Temporal");
+    return { workflowId, runId, stepId: activityId };
+  },
+  signal: () => Context.current().cancellationSignal
 };
 var temporalStep = (fn) => stepScope(alsScope).run(TEMPORAL_STEP, fn);
 function temporalActivities(activities) {
@@ -167,8 +176,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 +198,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 +290,15 @@ 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" || o.reuseClosedId ? {
+          workflowIdConflictPolicy: "FAIL",
+          workflowIdReusePolicy: o.reuseClosedId ? "ALLOW_DUPLICATE" : "REJECT_DUPLICATE"
+        } : { workflowIdConflictPolicy: "USE_EXISTING" }
+      }).catch((e) => {
+        throw fromTemporal(e);
+      });
       return wrap(h, ready);
     },
     async signalWithStart(target, args, o, topic, value) {

package/dist/workflow.js

@@ -6,6 +6,7 @@ import {
   deprecatePatch,
   executeChild,
   getExternalWorkflowHandle,
+  log,
   ParentClosePolicy,
   patched,
   proxyActivities,
@@ -15,7 +16,7 @@ import {
   TemporalFailure,
   workflowInfo
 } from "@temporalio/workflow";
-import { checkPriority, DEFAULT_PRIORITY, FlowError as FlowError2 } from "@iworkflow/core";
+import { checkPriority, DEFAULT_PRIORITY, FlowError as FlowError2, plainAttrs } from "@iworkflow/core";
 
 // src/failure.ts
 import {
@@ -126,8 +127,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) };
@@ -142,6 +145,7 @@ function temporalFlow(flow, patches = []) {
           throw e;
         throw new FlowError2(`процесса ${workflowId} нет или он завершён`, { reason: "not-found" });
       }),
+      log: async (level, message, attrs) => log[level](message, plainAttrs(attrs)),
       async setState(key, value) {
         state.set(key, value);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iworkflow/temporal",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "Temporal adapter for @iworkflow/core",
   "keywords": [
     "workflow",
@@ -41,7 +41,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@iworkflow/core": "^0.6.1"
+    "@iworkflow/core": "^0.8.0"
   },
   "peerDependencies": {
     "@temporalio/activity": "^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 };
@@ -77,6 +78,14 @@ const TEMPORAL_STEP: StepRuntime = {
   heartbeat: async (details) => Context.current().heartbeat(details),
   lastHeartbeat: async () => Context.current().info.heartbeatDetails,
   attempt: () => Context.current().info.attempt,
+  info: () => {
+    // Пустой id как ключ идемпотентности склеил бы записи разных процессов — отказ.
+    const { workflowExecution, activityId } = Context.current().info;
+    const { workflowId, runId } = workflowExecution ?? {};
+    if (!workflowId || !runId) throw new Error("stepInfo: шаг вне процесса Temporal");
+    return { workflowId, runId, stepId: activityId };
+  },
+  signal: () => Context.current().cancellationSignal,
 };
 
 /** Один вызов шага в рантайме Temporal без обёртки отказов — для тестов в MockActivityEnvironment. */
@@ -120,8 +129,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 {
@@ -137,7 +152,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(
@@ -232,7 +255,19 @@ 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" || o.reuseClosedId
+            ? {
+                workflowIdConflictPolicy: "FAIL" as const,
+                workflowIdReusePolicy: o.reuseClosedId ? ("ALLOW_DUPLICATE" as const) : ("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

@@ -8,6 +8,7 @@ import {
   deprecatePatch,
   executeChild,
   getExternalWorkflowHandle,
+  log,
   ParentClosePolicy,
   patched,
   proxyActivities,
@@ -18,7 +19,7 @@ import {
   workflowInfo,
 } from "@temporalio/workflow";
 
-import { checkPriority, DEFAULT_PRIORITY, FlowError, type ChildOptions, type Flow, type FlowContext, type StepOptions } from "@iworkflow/core";
+import { checkPriority, DEFAULT_PRIORITY, FlowError, plainAttrs, type ChildOptions, type Flow, type FlowContext, type StepOptions } from "@iworkflow/core";
 import { fromTemporal, toTemporal } from "./failure";
 
 export const SIGNAL = "iwf.signal";
@@ -94,15 +95,18 @@ 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> };
       },
       sleep: (ms) => sleep(ms),
       async recv<T>(topic: string, timeoutMs: number) {
+        // 0 и меньше — таймер 1 мс (так было и до 0.8): отдаёт активацию, цикл опроса не виснет.
         const ready = await condition(() => (inbox.get(topic)?.length ?? 0) > 0, timeoutMs);
         return ready ? (inbox.get(topic)!.shift() as T) : null;
       },
@@ -113,6 +117,9 @@ export function temporalFlow(flow: Flow, patches: string[] = []) {
             if (!(e instanceof TemporalFailure)) throw e;
             throw new FlowError(`процесса ${workflowId} нет или он завершён`, { reason: "not-found" });
           }),
+      // log песочницы молчит при переигрывании.
+      // Неклонируемые attrs (функция, BigInt) уронили бы активацию при отправке из песочницы.
+      log: async (level, message, attrs) => log[level](message, plainAttrs(attrs)),
       async setState(key, value) {
         state.set(key, value);
       },