@iworkflow/temporal 0.4.0 → 0.5.0

package/README.md

@@ -7,5 +7,6 @@ Temporal для `@iworkflow/core`. Peer: `@temporalio/{client,worker,workflow,ac
 - `@iworkflow/temporal/workflow` — только для входа песочницы модуля:
   `export const outreach = temporalFlow(flows.outreach, ["send-twice"])`.
 
-`opts` (`TemporalOptions`): `address`, `namespace`, `tls`, `apiKey` — источник токена, меняется каждые `apiKeyRenewMs`.
+`opts` (`TemporalOptions`): `address`, `namespace`, `tls`, `apiKey` — источник токена, меняется каждые `apiKeyRenewMs`;
+`plugins` — плагины SDK воркерам и клиенту; `temporalClient({ lazy: true })` — соединение при первом вызове.
 Без них — переменные `TEMPORAL_URL` (по умолчанию `127.0.0.1:17233`), `TEMPORAL_NAMESPACE`.

package/dist/connection.d.ts

@@ -1,4 +1,5 @@
-import type { TLSConfig } from "@temporalio/client";
+import type { ConnectionPlugin, TLSConfig } from "@temporalio/client";
+import type { WorkerPlugin } from "@temporalio/worker";
 /** Подключение к Temporal; не задано — TEMPORAL_URL и TEMPORAL_NAMESPACE из окружения. */
 export interface TemporalOptions {
     address?: string;
@@ -8,6 +9,8 @@ export interface TemporalOptions {
     /** Источник токена; соединение берёт свежий каждые apiKeyRenewMs (по умолчанию 60 с). */
     apiKey?: () => Promise<string>;
     apiKeyRenewMs?: number;
+    /** Плагины SDK (OpenTelemetry и т. п.) — воркерам и клиенту. */
+    plugins?: (ConnectionPlugin & WorkerPlugin)[];
 }
 export declare const address: (o: TemporalOptions) => string;
 export declare const namespace: (o: TemporalOptions) => string;

package/dist/index.d.ts

@@ -8,4 +8,7 @@ export type { TemporalOptions };
 export declare function temporalRuntime(workflowsPath: string, opts?: TemporalOptions & {
     workflowBundlePath?: string;
 }): EngineRuntime;
-export declare function temporalClient(opts?: TemporalOptions): Promise<EngineClient>;
+/** lazy — соединение при первом вызове: модуль поднимается и без Temporal. */
+export declare function temporalClient(opts?: TemporalOptions & {
+    lazy?: boolean;
+}): Promise<EngineClient>;

package/dist/index.js

@@ -4,6 +4,8 @@ import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
   bindStepRuntime,
+  checkPriority,
+  DEFAULT_PRIORITY,
   exitSignal,
   FlowError as FlowError2
 } from "@iworkflow/core";
@@ -74,7 +76,8 @@ function toTemporal(e, nonRetryable) {
       message: e.message,
       type: e.type,
       details: [e.details],
-      nonRetryable: nonRetryable || e.nonRetryable
+      nonRetryable: nonRetryable || e.nonRetryable,
+      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });
@@ -99,18 +102,31 @@ var notFound = (id) => (e) => {
     throw new FlowError2(`процесса ${id} нет`, { reason: "not-found" });
   throw e;
 };
-var wrap = (h) => ({
+var wrap = (h, ready = async () => {}) => ({
   id: h.workflowId,
-  result: () => h.result().catch((e) => {
-    throw e instanceof WorkflowFailedError && cause(e.cause) || e;
-  }),
-  signal: (topic, value) => h.signal(SIGNAL, { topic, value }),
-  query: async (key) => await h.query(QUERY, key) ?? undefined,
+  result: async () => {
+    await ready();
+    return h.result().catch((e) => {
+      throw e instanceof WorkflowFailedError && cause(e.cause) || e;
+    });
+  },
+  signal: async (topic, value) => {
+    await ready();
+    await h.signal(SIGNAL, { topic, value });
+  },
+  query: async (key) => {
+    await ready();
+    return await h.query(QUERY, key) ?? undefined;
+  },
   async describe() {
+    await ready();
     const d = await h.describe().catch(notFound(h.workflowId));
     return { id: h.workflowId, status: STATUS[d.status.name] ?? "running", startedAt: d.startTime };
   },
-  terminate: async (reason) => void await h.terminate(reason).catch(notFound(h.workflowId))
+  async terminate(reason) {
+    await ready();
+    await h.terminate(reason).catch(notFound(h.workflowId));
+  }
 });
 var withFailures = (activities) => Object.fromEntries(Object.entries(activities).map(([name, fn]) => [
   name,
@@ -139,7 +155,8 @@ function temporalRuntime(workflowsPath, opts = {}) {
       stopping = false;
       bindStepRuntime({
         heartbeat: async (details) => Context.current().heartbeat(details),
-        lastHeartbeat: async () => Context.current().info.heartbeatDetails
+        lastHeartbeat: async () => Context.current().info.heartbeatDetails,
+        attempt: () => Context.current().info.attempt
       });
       let c;
       try {
@@ -152,7 +169,7 @@ function temporalRuntime(workflowsPath, opts = {}) {
       stopRenew = renewApiKey(opts, (t) => c.setApiKey(t));
       try {
         const activities = withFailures(def.activities);
-        const base = { connection: c, namespace: namespace(opts) };
+        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 })];
         for (const [pool, limit] of Object.entries(def.pools ?? {}))
@@ -205,21 +222,52 @@ function temporalRuntime(workflowsPath, opts = {}) {
   };
 }
 async function temporalClient(opts = {}) {
-  const connection = await Connection.connect(await connectOptions(opts));
-  const stopRenew = renewApiKey(opts, (t) => connection.setApiKey(t));
+  let connection;
+  let stopRenew;
+  let ready = async () => {
+    return;
+  };
+  const plugins = opts.plugins ? { plugins: opts.plugins } : {};
+  if (opts.lazy) {
+    let token = "";
+    const apiKey = opts.apiKey;
+    let pending;
+    if (apiKey)
+      ready = async () => token || (token = await (pending ??= apiKey().finally(() => pending = undefined)));
+    connection = Connection.lazy({
+      ...await connectOptions({ ...opts, apiKey: undefined }),
+      ...apiKey ? { apiKey: () => token } : {},
+      ...plugins
+    });
+    stopRenew = renewApiKey(opts, (t) => token = t);
+  } else {
+    connection = await Connection.connect({ ...await connectOptions(opts), ...plugins });
+    stopRenew = renewApiKey(opts, (t) => connection.setApiKey(t));
+  }
   const client = new Client({ connection, namespace: namespace(opts) });
+  const startOptions = (target, args, o) => ({
+    taskQueue: target.app,
+    workflowId: o.id,
+    args,
+    ...o.timeoutMs ? { workflowExecutionTimeout: o.timeoutMs } : {},
+    priority: { priorityKey: checkPriority(o.priority) ?? DEFAULT_PRIORITY }
+  });
   return {
-    async start(target, args, opts) {
-      const h = await client.workflow.start(target.flow, {
-        taskQueue: target.app,
-        workflowId: opts.id,
-        args,
-        workflowIdConflictPolicy: "USE_EXISTING",
-        ...opts.timeoutMs ? { workflowExecutionTimeout: opts.timeoutMs } : {}
+    async start(target, args, o) {
+      await ready();
+      const h = await client.workflow.start(target.flow, { ...startOptions(target, args, o), workflowIdConflictPolicy: "USE_EXISTING" });
+      return wrap(h, ready);
+    },
+    async signalWithStart(target, args, o, topic, value) {
+      await ready();
+      const h = await client.workflow.signalWithStart(target.flow, {
+        ...startOptions(target, args, o),
+        signal: SIGNAL,
+        signalArgs: [{ topic, value }]
       });
-      return wrap(h);
+      return wrap(h, ready);
     },
-    handle: (id) => wrap(client.workflow.getHandle(id)),
+    handle: (id) => wrap(client.workflow.getHandle(id), ready),
     close: () => (stopRenew(), connection.close())
   };
 }

package/dist/workflow.js

@@ -15,7 +15,7 @@ import {
   TemporalFailure,
   workflowInfo
 } from "@temporalio/workflow";
-import { FlowError as FlowError2 } from "@iworkflow/core";
+import { checkPriority, DEFAULT_PRIORITY, FlowError as FlowError2 } from "@iworkflow/core";
 
 // src/failure.ts
 import {
@@ -56,7 +56,8 @@ function toTemporal(e, nonRetryable) {
       message: e.message,
       type: e.type,
       details: [e.details],
-      nonRetryable: nonRetryable || e.nonRetryable
+      nonRetryable: nonRetryable || e.nonRetryable,
+      ...e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });
@@ -71,7 +72,8 @@ var queryDef = defineQuery(QUERY);
 var poolQueue = (app, pool) => `${app}@${pool}`;
 var proxies = new Map;
 function activitiesWith(opts = {}) {
-  const key = JSON.stringify(opts);
+  const priority = checkPriority(opts.priority) ?? workflowInfo().priority?.priorityKey;
+  const key = JSON.stringify({ ...opts, priority });
   let p = proxies.get(key);
   if (!p) {
     p = proxyActivities({
@@ -79,9 +81,10 @@ function activitiesWith(opts = {}) {
       startToCloseTimeout: opts.timeoutMs ?? 60000,
       ...opts.totalTimeoutMs ? { scheduleToCloseTimeout: opts.totalTimeoutMs } : {},
       ...opts.heartbeatTimeoutMs ? { heartbeatTimeout: opts.heartbeatTimeoutMs } : {},
+      ...priority ? { priority: { priorityKey: priority } } : {},
       retry: {
         maximumAttempts: opts.attempts ?? 3,
-        initialInterval: opts.retryIntervalMs ?? 200,
+        initialInterval: Math.max(opts.retryIntervalMs ?? 200, 1),
         backoffCoefficient: opts.backoff ?? 1,
         ...opts.maxRetryIntervalMs ? { maximumInterval: opts.maxRetryIntervalMs } : {},
         ...opts.nonRetryableTypes ? { nonRetryableErrorTypes: opts.nonRetryableTypes } : {}
@@ -116,6 +119,8 @@ function temporalFlow(flow, patches = []) {
       workflowId: info.workflowId,
       parentId: info.parent?.workflowId,
       startedAt: info.startTime,
+      priority: info.priority?.priorityKey || DEFAULT_PRIORITY,
+      now: async () => Date.now(),
       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) {

package/package.json

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

package/src/connection.ts

@@ -1,5 +1,6 @@
 // Подключение к Temporal: адрес, TLS, токен с заменой на месте — общее для воркера и клиента.
-import type { TLSConfig } from "@temporalio/client";
+import type { ConnectionPlugin, TLSConfig } from "@temporalio/client";
+import type { WorkerPlugin } from "@temporalio/worker";
 
 /** Подключение к Temporal; не задано — TEMPORAL_URL и TEMPORAL_NAMESPACE из окружения. */
 export interface TemporalOptions {
@@ -10,6 +11,8 @@ export interface TemporalOptions {
   /** Источник токена; соединение берёт свежий каждые apiKeyRenewMs (по умолчанию 60 с). */
   apiKey?: () => Promise<string>;
   apiKeyRenewMs?: number;
+  /** Плагины SDK (OpenTelemetry и т. п.) — воркерам и клиенту. */
+  plugins?: (ConnectionPlugin & WorkerPlugin)[];
 }
 
 export const address = (o: TemporalOptions) => o.address ?? process.env.TEMPORAL_URL ?? "127.0.0.1:17233";

package/src/failure.ts

@@ -41,6 +41,8 @@ export function toTemporal(e: unknown, nonRetryable: boolean): unknown {
       type: e.type,
       details: [e.details],
       nonRetryable: nonRetryable || e.nonRetryable,
+      // 0 сервер считает «не задано» и берёт паузу политики; 1 мс — «сразу», как у DBOS.
+      ...(e.retryAfterMs !== undefined ? { nextRetryDelay: Math.max(e.retryAfterMs, 1) } : {}),
     });
   if (isFlowError(e))
     return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });

package/src/index.ts

@@ -4,6 +4,8 @@ import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
   bindStepRuntime,
+  checkPriority,
+  DEFAULT_PRIORITY,
   exitSignal,
   FlowError,
   type Activity,
@@ -11,7 +13,9 @@ import {
   type EngineClient,
   type EngineRuntime,
   type FlowHandle,
+  type FlowRef,
   type FlowStatus,
+  type StartOptions,
 } from "@iworkflow/core";
 import { address, connectOptions, namespace, renewApiKey, type TemporalOptions } from "./connection";
 import { cause, toTemporal } from "./failure";
@@ -38,19 +42,32 @@ const notFound = (id: string) => (e: unknown): never => {
   throw e;
 };
 
-const wrap = <T>(h: WorkflowHandle): FlowHandle<T> => ({
+/** ready — токен ленивого клиента: без него SDK уйдёт с пустым ключом. */
+const wrap = <T>(h: WorkflowHandle, ready: () => Promise<unknown> = async () => {}): FlowHandle<T> => ({
   id: h.workflowId,
-  result: () =>
-    h.result().catch((e) => {
+  result: async () => {
+    await ready();
+    return h.result().catch((e) => {
       throw (e instanceof WorkflowFailedError && cause(e.cause)) || e;
-    }),
-  signal: (topic, value) => h.signal(SIGNAL, { topic, value }),
-  query: async <V>(key: string) => ((await h.query(QUERY, key)) ?? undefined) as V | undefined,
+    });
+  },
+  signal: async (topic, value) => {
+    await ready();
+    await h.signal(SIGNAL, { topic, value });
+  },
+  query: async <V>(key: string) => {
+    await ready();
+    return ((await h.query(QUERY, key)) ?? undefined) as V | undefined;
+  },
   async describe() {
+    await ready();
     const d = await h.describe().catch(notFound(h.workflowId));
     return { id: h.workflowId, status: STATUS[d.status.name] ?? "running", startedAt: d.startTime };
   },
-  terminate: async (reason) => void (await h.terminate(reason).catch(notFound(h.workflowId))),
+  async terminate(reason) {
+    await ready();
+    await h.terminate(reason).catch(notFound(h.workflowId));
+  },
 });
 
 /** Шаги отдают Failure как ApplicationFailure: тип, детали и nonRetryable доезжают до процесса. */
@@ -92,6 +109,7 @@ export function temporalRuntime(
       bindStepRuntime({
         heartbeat: async (details) => Context.current().heartbeat(details),
         lastHeartbeat: async () => Context.current().info.heartbeatDetails,
+        attempt: () => Context.current().info.attempt,
       });
       let c: NativeConnection;
       try {
@@ -105,7 +123,7 @@ export function temporalRuntime(
       // Воркер не создался (нет бандла, namespace) — соединение и таймер токена закрываются.
       try {
         const activities = withFailures(def.activities);
-        const base = { connection: c, namespace: namespace(opts) };
+        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 })];
         // Пул — своя очередь с пределом одновременных шагов в этом процессе.
@@ -162,22 +180,59 @@ export function temporalRuntime(
   };
 }
 
-export async function temporalClient(opts: TemporalOptions = {}): Promise<EngineClient> {
-  const connection = await Connection.connect(await connectOptions(opts));
-  const stopRenew = renewApiKey(opts, (t) => connection.setApiKey(t));
+/** lazy — соединение при первом вызове: модуль поднимается и без Temporal. */
+export async function temporalClient(opts: TemporalOptions & { lazy?: boolean } = {}): Promise<EngineClient> {
+  let connection: Connection;
+  let stopRenew: () => void;
+  let ready = async (): Promise<unknown> => undefined;
+  const plugins = opts.plugins ? { plugins: opts.plugins } : {};
+  if (opts.lazy) {
+    // Ни Temporal, ни источник токена не нужны для старта: ключ — функцией, берётся при первом вызове.
+    let token = "";
+    const apiKey = opts.apiKey;
+    // Неудача не залипает: следующий вызов спросит токен снова.
+    // Один запрос на всех ждущих; неудача не залипает: следующий вызов спросит снова.
+    let pending: Promise<string> | undefined;
+    if (apiKey)
+      ready = async () =>
+        token ||
+        (token = await (pending ??= apiKey().finally(() => (pending = undefined))));
+    connection = Connection.lazy({
+      ...(await connectOptions({ ...opts, apiKey: undefined })),
+      ...(apiKey ? { apiKey: () => token } : {}),
+      ...plugins,
+    });
+    stopRenew = renewApiKey(opts, (t) => (token = t));
+  } else {
+    connection = await Connection.connect({ ...(await connectOptions(opts)), ...plugins });
+    stopRenew = renewApiKey(opts, (t) => connection.setApiKey(t));
+  }
+  // Плагины — у соединения: оно само передаёт их клиенту.
   const client = new Client({ connection, namespace: namespace(opts) });
+  const startOptions = (target: FlowRef, args: unknown[], o: StartOptions) => ({
+    taskQueue: target.app,
+    workflowId: o.id,
+    args,
+    ...(o.timeoutMs ? { workflowExecutionTimeout: o.timeoutMs } : {}),
+    // Явно и по умолчанию: ctx.priority и очередь видят одно и то же, как у DBOS.
+    priority: { priorityKey: checkPriority(o.priority) ?? DEFAULT_PRIORITY },
+  });
   return {
-    async start(target, args, opts) {
-      const h = await client.workflow.start(target.flow, {
-        taskQueue: target.app,
-        workflowId: opts.id,
-        args,
-        workflowIdConflictPolicy: "USE_EXISTING",
-        ...(opts.timeoutMs ? { workflowExecutionTimeout: opts.timeoutMs } : {}),
+    async start(target, args, o) {
+      await ready();
+      const h = await client.workflow.start(target.flow, { ...startOptions(target, args, o), workflowIdConflictPolicy: "USE_EXISTING" });
+      return wrap(h, ready);
+    },
+    async signalWithStart(target, args, o, topic, value) {
+      await ready();
+      const h = await client.workflow.signalWithStart(target.flow, {
+        ...startOptions(target, args, o),
+        signal: SIGNAL,
+        signalArgs: [{ topic, value }],
       });
-      return wrap(h);
+      return wrap(h, ready);
     },
-    handle: (id) => wrap(client.workflow.getHandle(id)),
+    handle: (id) => wrap(client.workflow.getHandle(id), ready),
     close: () => (stopRenew(), connection.close()),
   };
 }

package/src/workflow.ts

@@ -18,7 +18,7 @@ import {
   workflowInfo,
 } from "@temporalio/workflow";
 
-import { FlowError, type ChildOptions, type Flow, type FlowContext, type StepOptions } from "@iworkflow/core";
+import { checkPriority, DEFAULT_PRIORITY, FlowError, type ChildOptions, type Flow, type FlowContext, type StepOptions } from "@iworkflow/core";
 import { fromTemporal, toTemporal } from "./failure";
 
 export const SIGNAL = "iwf.signal";
@@ -32,7 +32,9 @@ export const poolQueue = (app: string, pool: string) => `${app}@${pool}`;
 const proxies = new Map<string, Record<string, (...a: unknown[]) => Promise<unknown>>>();
 
 function activitiesWith(opts: StepOptions = {}) {
-  const key = JSON.stringify(opts);
+  // Шаг без своего приоритета — с приоритетом процесса, как у Temporal по умолчанию.
+  const priority = checkPriority(opts.priority) ?? workflowInfo().priority?.priorityKey;
+  const key = JSON.stringify({ ...opts, priority });
   let p = proxies.get(key);
   if (!p) {
     p = proxyActivities({
@@ -40,9 +42,11 @@ function activitiesWith(opts: StepOptions = {}) {
       startToCloseTimeout: opts.timeoutMs ?? 60_000,
       ...(opts.totalTimeoutMs ? { scheduleToCloseTimeout: opts.totalTimeoutMs } : {}),
       ...(opts.heartbeatTimeoutMs ? { heartbeatTimeout: opts.heartbeatTimeoutMs } : {}),
+      ...(priority ? { priority: { priorityKey: priority } } : {}),
       retry: {
         maximumAttempts: opts.attempts ?? 3,
-        initialInterval: opts.retryIntervalMs ?? 200,
+        // 0 Temporal не принимает (ValueError — вечный повтор задачи процесса): 1 мс — «сразу», как у DBOS.
+        initialInterval: Math.max(opts.retryIntervalMs ?? 200, 1),
         backoffCoefficient: opts.backoff ?? 1,
         ...(opts.maxRetryIntervalMs ? { maximumInterval: opts.maxRetryIntervalMs } : {}),
         ...(opts.nonRetryableTypes ? { nonRetryableErrorTypes: opts.nonRetryableTypes } : {}),
@@ -83,6 +87,9 @@ export function temporalFlow(flow: Flow, patches: string[] = []) {
       workflowId: info.workflowId,
       parentId: info.parent?.workflowId,
       startedAt: info.startTime,
+      priority: info.priority?.priorityKey || DEFAULT_PRIORITY,
+      // Date.now() в песочнице Temporal детерминирован: время задачи процесса.
+      now: async () => Date.now(),
       step: (name, stepArgs, opts) => activitiesWith(opts)[name]!(...stepArgs).catch(rethrow) as Promise<never>,
       child: (target, childArgs, opts) =>
         executeChild(target.flow, childOptions(target.app, childArgs, opts)).catch(rethrow) as Promise<never>,