@iworkflow/temporal 0.7.0 → 0.8.0

package/dist/index.js

@@ -141,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) {
@@ -284,7 +292,10 @@ async function temporalClient(opts = {}) {
       await ready();
       const h = await client.workflow.start(target.flow, {
         ...startOptions(target, args, o),
-        ...o.onExisting === "reject" ? { workflowIdConflictPolicy: "FAIL", workflowIdReusePolicy: "REJECT_DUPLICATE" } : { workflowIdConflictPolicy: "USE_EXISTING" }
+        ...o.onExisting === "reject" || o.reuseClosedId ? {
+          workflowIdConflictPolicy: "FAIL",
+          workflowIdReusePolicy: o.reuseClosedId ? "ALLOW_DUPLICATE" : "REJECT_DUPLICATE"
+        } : { workflowIdConflictPolicy: "USE_EXISTING" }
       }).catch((e) => {
         throw fromTemporal(e);
       });

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 {
@@ -144,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.7.0",
+  "version": "0.8.0",
   "description": "Temporal adapter for @iworkflow/core",
   "keywords": [
     "workflow",
@@ -41,7 +41,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@iworkflow/core": "^0.7.0"
+    "@iworkflow/core": "^0.8.0"
   },
   "peerDependencies": {
     "@temporalio/activity": "^1.24.0",

package/src/index.ts

@@ -78,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. */
@@ -250,8 +258,11 @@ export async function temporalClient(opts: TemporalOptions & { lazy?: boolean }
       const h = await client.workflow
         .start(target.flow, {
           ...startOptions(target, args, o),
-          ...(o.onExisting === "reject"
-            ? { workflowIdConflictPolicy: "FAIL" as const, workflowIdReusePolicy: "REJECT_DUPLICATE" as const }
+          ...(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) => {

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";
@@ -105,6 +106,7 @@ export function temporalFlow(flow: Flow, patches: string[] = []) {
       },
       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;
       },
@@ -115,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);
       },