@iworkflow/temporal 0.3.0 → 0.4.0

package/dist/connection.d.ts

@@ -0,0 +1,20 @@
+import type { TLSConfig } from "@temporalio/client";
+/** Подключение к Temporal; не задано — TEMPORAL_URL и TEMPORAL_NAMESPACE из окружения. */
+export interface TemporalOptions {
+    address?: string;
+    namespace?: string;
+    /** TLSConfig SDK (serverNameOverride, свой CA, mTLS). С apiKey SDK включает TLS сам — без TLS только `false`. */
+    tls?: boolean | TLSConfig;
+    /** Источник токена; соединение берёт свежий каждые apiKeyRenewMs (по умолчанию 60 с). */
+    apiKey?: () => Promise<string>;
+    apiKeyRenewMs?: number;
+}
+export declare const address: (o: TemporalOptions) => string;
+export declare const namespace: (o: TemporalOptions) => string;
+/** Токен меняется на месте: иначе воркер однажды молча перестанет брать задачи. */
+export declare function renewApiKey(o: TemporalOptions, set: (token: string) => unknown): () => void;
+export declare const connectOptions: (o: TemporalOptions) => Promise<{
+    address: string;
+    tls?: boolean | TLSConfig | undefined;
+    apiKey?: string | undefined;
+}>;

package/dist/failure.d.ts

@@ -0,0 +1,7 @@
+import { FlowError } from "@iworkflow/core";
+/** Отказ шага, дочернего процесса или процесса целиком — FlowError; прочее (отмена) — как есть. */
+export declare function fromTemporal(e: unknown): unknown;
+/** Причина отказа процесса или шага — FlowError; undefined — причина не наша (отмена и т. п.). */
+export declare function cause(c: Error | undefined, exhausted?: boolean): FlowError | undefined;
+/** Отказ из кода порта — ApplicationFailure: обычная ошибка в песочнице не роняет процесс, а повторяет задачу. */
+export declare function toTemporal(e: unknown, nonRetryable: boolean): unknown;

package/dist/index.d.ts

@@ -0,0 +1,11 @@
+import { type EngineClient, type EngineRuntime } from "@iworkflow/core";
+import { type TemporalOptions } from "./connection";
+export type { TemporalOptions };
+/**
+ * workflowsPath — вход песочницы модуля: temporalFlow(...) на каждый процесс, имя экспорта = имя процесса.
+ * workflowBundlePath — готовый бандл того же входа (прод-сборка); с ним воркер не собирает код сам.
+ */
+export declare function temporalRuntime(workflowsPath: string, opts?: TemporalOptions & {
+    workflowBundlePath?: string;
+}): EngineRuntime;
+export declare function temporalClient(opts?: TemporalOptions): Promise<EngineClient>;

package/dist/index.js

@@ -0,0 +1,229 @@
+// src/index.ts
+import { Client, Connection, WorkflowFailedError, WorkflowNotFoundError } from "@temporalio/client";
+import { Context } from "@temporalio/activity";
+import { NativeConnection, Worker } from "@temporalio/worker";
+import {
+  bindStepRuntime,
+  exitSignal,
+  FlowError as FlowError2
+} from "@iworkflow/core";
+
+// src/connection.ts
+var address = (o) => o.address ?? process.env.TEMPORAL_URL ?? "127.0.0.1:17233";
+var namespace = (o) => o.namespace ?? process.env.TEMPORAL_NAMESPACE ?? "default";
+function renewApiKey(o, set) {
+  if (!o.apiKey)
+    return () => {};
+  const apiKey = o.apiKey;
+  let busy = false;
+  let stopped = false;
+  const timer = setInterval(() => {
+    if (busy)
+      return;
+    busy = true;
+    apiKey().then((t) => stopped ? undefined : set(t)).catch((e) => stopped || console.error("токен Temporal не обновлён:", e)).finally(() => busy = false);
+  }, o.apiKeyRenewMs ?? 60000);
+  timer.unref?.();
+  return () => {
+    stopped = true;
+    clearInterval(timer);
+  };
+}
+var connectOptions = async (o) => ({
+  address: address(o),
+  ...o.tls !== undefined ? { tls: o.tls } : {},
+  ...o.apiKey ? { apiKey: await o.apiKey() } : {}
+});
+
+// src/failure.ts
+import {
+  ActivityFailure,
+  ApplicationFailure,
+  ChildWorkflowFailure,
+  TerminatedFailure,
+  TimeoutFailure,
+  WorkflowExecutionAlreadyStartedError
+} from "@temporalio/common";
+import { Failure, FlowError, isFlowError } from "@iworkflow/core";
+function fromTemporal(e) {
+  if (e instanceof WorkflowExecutionAlreadyStartedError)
+    return new FlowError(`процесс ${e.workflowId} уже есть`, { reason: "already-started" });
+  if (e instanceof ActivityFailure) {
+    const exhausted = e.retryState === "MAXIMUM_ATTEMPTS_REACHED";
+    const f = cause(e.cause, exhausted);
+    if (f && e.retryState === "TIMEOUT")
+      return new FlowError(f.message, { reason: "timeout", type: f.type, details: f.details });
+    return f ?? e;
+  }
+  if (e instanceof ChildWorkflowFailure)
+    return cause(e.cause, false) ?? e;
+  return e;
+}
+function cause(c, exhausted = false) {
+  if (c instanceof TimeoutFailure)
+    return new FlowError(c.message || "срок вышел", { reason: "timeout", exhausted });
+  if (c instanceof TerminatedFailure)
+    return new FlowError(c.message || "процесс прерван", { reason: "terminated" });
+  if (c instanceof ApplicationFailure)
+    return new FlowError(c.message, { reason: "failed", type: c.type ?? undefined, details: c.details?.[0], exhausted });
+  return;
+}
+function toTemporal(e, nonRetryable) {
+  if (e instanceof Failure)
+    return ApplicationFailure.create({
+      message: e.message,
+      type: e.type,
+      details: [e.details],
+      nonRetryable: nonRetryable || e.nonRetryable
+    });
+  if (isFlowError(e))
+    return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });
+  return e;
+}
+
+// src/index.ts
+var SIGNAL = "iwf.signal";
+var QUERY = "iwf.query";
+var poolQueue = (app, pool) => `${app}@${pool}`;
+var STATUS = {
+  RUNNING: "running",
+  COMPLETED: "completed",
+  FAILED: "failed",
+  CANCELLED: "terminated",
+  TERMINATED: "terminated",
+  TIMED_OUT: "timed-out",
+  CONTINUED_AS_NEW: "running"
+};
+var notFound = (id) => (e) => {
+  if (e instanceof WorkflowNotFoundError)
+    throw new FlowError2(`процесса ${id} нет`, { reason: "not-found" });
+  throw e;
+};
+var wrap = (h) => ({
+  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,
+  async describe() {
+    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))
+});
+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);
+    }
+  }
+]));
+function temporalRuntime(workflowsPath, opts = {}) {
+  let workers = [];
+  let running = [];
+  let conn;
+  let starting = false;
+  let stopping = false;
+  const exit = exitSignal();
+  let stopRenew = () => {};
+  return {
+    async start(def) {
+      if (starting)
+        throw new Error("воркер уже запущен");
+      starting = true;
+      exit.arm();
+      stopping = false;
+      bindStepRuntime({
+        heartbeat: async (details) => Context.current().heartbeat(details),
+        lastHeartbeat: async () => Context.current().info.heartbeatDetails
+      });
+      let c;
+      try {
+        c = conn = await NativeConnection.connect(await connectOptions(opts));
+      } catch (e) {
+        starting = false;
+        exit.reject(e);
+        throw e;
+      }
+      stopRenew = renewApiKey(opts, (t) => c.setApiKey(t));
+      try {
+        const activities = withFailures(def.activities);
+        const base = { connection: c, namespace: namespace(opts) };
+        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 ?? {}))
+          workers.push(await Worker.create({
+            ...base,
+            taskQueue: poolQueue(def.app, pool),
+            activities,
+            maxConcurrentActivityTaskExecutions: limit
+          }));
+      } catch (e) {
+        await Promise.allSettled(workers.map(async (w) => {
+          const r = w.run();
+          w.shutdown();
+          await r;
+        }));
+        stopRenew();
+        await c.close().catch(() => {});
+        conn = undefined;
+        workers = [];
+        starting = false;
+        exit.reject(e);
+        throw e;
+      }
+      running = workers.map((w) => w.run());
+      Promise.all(running).then(() => stopping || exit.resolve(), () => {});
+      for (const r of running)
+        r.catch((e) => stopping || exit.reject(e));
+    },
+    done: () => exit.promise(),
+    async stop() {
+      stopping = true;
+      for (const w of workers)
+        if (w.getState() === "RUNNING")
+          w.shutdown();
+      const done = await Promise.allSettled(running);
+      stopRenew();
+      try {
+        await conn?.close();
+      } finally {
+        conn = undefined;
+        workers = [];
+        running = [];
+        starting = false;
+        exit.resolve();
+      }
+      const failed = done.find((r) => r.status === "rejected");
+      if (failed)
+        throw failed.reason;
+    }
+  };
+}
+async function temporalClient(opts = {}) {
+  const connection = await Connection.connect(await connectOptions(opts));
+  const stopRenew = renewApiKey(opts, (t) => connection.setApiKey(t));
+  const client = new Client({ connection, namespace: namespace(opts) });
+  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 } : {}
+      });
+      return wrap(h);
+    },
+    handle: (id) => wrap(client.workflow.getHandle(id)),
+    close: () => (stopRenew(), connection.close())
+  };
+}
+export {
+  temporalClient,
+  temporalRuntime
+};

package/dist/workflow.d.ts

@@ -0,0 +1,7 @@
+import { type Flow } from "@iworkflow/core";
+export declare const SIGNAL = "iwf.signal";
+export declare const QUERY = "iwf.query";
+/** Очередь пула шагов модуля; воркер пула поднимает temporalRuntime. */
+export declare const poolQueue: (app: string, pool: string) => string;
+/** patches — как AppDefinition.patches: необъявленный id — ошибка, как у DBOS. */
+export declare function temporalFlow(flow: Flow, patches?: string[]): (...args: unknown[]) => Promise<unknown>;

package/dist/workflow.js

@@ -0,0 +1,160 @@
+// src/workflow.ts
+import {
+  condition,
+  defineQuery,
+  defineSignal,
+  deprecatePatch,
+  executeChild,
+  getExternalWorkflowHandle,
+  ParentClosePolicy,
+  patched,
+  proxyActivities,
+  setHandler,
+  sleep,
+  startChild,
+  TemporalFailure,
+  workflowInfo
+} from "@temporalio/workflow";
+import { FlowError as FlowError2 } from "@iworkflow/core";
+
+// src/failure.ts
+import {
+  ActivityFailure,
+  ApplicationFailure,
+  ChildWorkflowFailure,
+  TerminatedFailure,
+  TimeoutFailure,
+  WorkflowExecutionAlreadyStartedError
+} from "@temporalio/common";
+import { Failure, FlowError, isFlowError } from "@iworkflow/core";
+function fromTemporal(e) {
+  if (e instanceof WorkflowExecutionAlreadyStartedError)
+    return new FlowError(`процесс ${e.workflowId} уже есть`, { reason: "already-started" });
+  if (e instanceof ActivityFailure) {
+    const exhausted = e.retryState === "MAXIMUM_ATTEMPTS_REACHED";
+    const f = cause(e.cause, exhausted);
+    if (f && e.retryState === "TIMEOUT")
+      return new FlowError(f.message, { reason: "timeout", type: f.type, details: f.details });
+    return f ?? e;
+  }
+  if (e instanceof ChildWorkflowFailure)
+    return cause(e.cause, false) ?? e;
+  return e;
+}
+function cause(c, exhausted = false) {
+  if (c instanceof TimeoutFailure)
+    return new FlowError(c.message || "срок вышел", { reason: "timeout", exhausted });
+  if (c instanceof TerminatedFailure)
+    return new FlowError(c.message || "процесс прерван", { reason: "terminated" });
+  if (c instanceof ApplicationFailure)
+    return new FlowError(c.message, { reason: "failed", type: c.type ?? undefined, details: c.details?.[0], exhausted });
+  return;
+}
+function toTemporal(e, nonRetryable) {
+  if (e instanceof Failure)
+    return ApplicationFailure.create({
+      message: e.message,
+      type: e.type,
+      details: [e.details],
+      nonRetryable: nonRetryable || e.nonRetryable
+    });
+  if (isFlowError(e))
+    return ApplicationFailure.create({ message: e.message, type: e.type ?? e.reason, details: [e.details], nonRetryable });
+  return e;
+}
+
+// src/workflow.ts
+var SIGNAL = "iwf.signal";
+var QUERY = "iwf.query";
+var signalDef = defineSignal(SIGNAL);
+var queryDef = defineQuery(QUERY);
+var poolQueue = (app, pool) => `${app}@${pool}`;
+var proxies = new Map;
+function activitiesWith(opts = {}) {
+  const key = JSON.stringify(opts);
+  let p = proxies.get(key);
+  if (!p) {
+    p = proxyActivities({
+      ...opts.pool ? { taskQueue: poolQueue(workflowInfo().taskQueue, opts.pool) } : {},
+      startToCloseTimeout: opts.timeoutMs ?? 60000,
+      ...opts.totalTimeoutMs ? { scheduleToCloseTimeout: opts.totalTimeoutMs } : {},
+      ...opts.heartbeatTimeoutMs ? { heartbeatTimeout: opts.heartbeatTimeoutMs } : {},
+      retry: {
+        maximumAttempts: opts.attempts ?? 3,
+        initialInterval: opts.retryIntervalMs ?? 200,
+        backoffCoefficient: opts.backoff ?? 1,
+        ...opts.maxRetryIntervalMs ? { maximumInterval: opts.maxRetryIntervalMs } : {},
+        ...opts.nonRetryableTypes ? { nonRetryableErrorTypes: opts.nonRetryableTypes } : {}
+      }
+    });
+    proxies.set(key, p);
+  }
+  return p;
+}
+var childOptions = (app, args, opts) => ({
+  taskQueue: app,
+  workflowId: opts.id,
+  args,
+  ...opts.timeoutMs ? { workflowExecutionTimeout: opts.timeoutMs } : {},
+  ...opts.onExisting === "reject" ? { workflowIdReusePolicy: "REJECT_DUPLICATE" } : {}
+});
+var rethrow = (e) => {
+  throw fromTemporal(e);
+};
+function temporalFlow(flow, patches = []) {
+  return async (...args) => {
+    const inbox = new Map;
+    const state = new Map;
+    setHandler(signalDef, ({ topic, value }) => {
+      const q = inbox.get(topic) ?? [];
+      q.push(value);
+      inbox.set(topic, q);
+    });
+    setHandler(queryDef, (key) => state.get(key));
+    const info = workflowInfo();
+    const ctx = {
+      workflowId: info.workflowId,
+      parentId: info.parent?.workflowId,
+      startedAt: info.startTime,
+      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 h = await startChild(target.flow, {
+          ...childOptions(target.app, childArgs, { ...opts, onExisting: "reject" }),
+          parentClosePolicy: ParentClosePolicy.ABANDON
+        }).catch(rethrow);
+        return { id: opts.id, result: () => h.result().catch(rethrow) };
+      },
+      sleep: (ms) => sleep(ms),
+      async recv(topic, timeoutMs) {
+        const ready = await condition(() => (inbox.get(topic)?.length ?? 0) > 0, timeoutMs);
+        return ready ? inbox.get(topic).shift() : null;
+      },
+      signal: (workflowId, topic, value) => getExternalWorkflowHandle(workflowId).signal(signalDef, { topic, value }).catch((e) => {
+        if (!(e instanceof TemporalFailure))
+          throw e;
+        throw new FlowError2(`процесса ${workflowId} нет или он завершён`, { reason: "not-found" });
+      }),
+      async setState(key, value) {
+        state.set(key, value);
+      },
+      patched: async (id) => {
+        if (!patches.includes(id))
+          throw new Error(`патч "${id}" не объявлен в patches процесса`);
+        return patched(id);
+      },
+      deprecatePatch: async (id) => deprecatePatch(id)
+    };
+    try {
+      return await flow(ctx, ...args);
+    } catch (e) {
+      throw toTemporal(e, true);
+    }
+  };
+}
+export {
+  QUERY,
+  SIGNAL,
+  poolQueue,
+  temporalFlow
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iworkflow/temporal",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Temporal adapter for @iworkflow/core",
   "keywords": [
     "workflow",
@@ -13,23 +13,35 @@
     "directory": "packages/temporal"
   },
   "files": [
-    "src"
+    "src",
+    "!src/**/*.test.ts",
+    "dist"
   ],
   "type": "module",
   "sideEffects": false,
   "exports": {
-    ".": "./src/index.ts",
-    "./workflow": "./src/workflow.ts"
+    ".": {
+      "bun": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./workflow": {
+      "bun": "./src/workflow.ts",
+      "types": "./dist/workflow.d.ts",
+      "default": "./dist/workflow.js"
+    }
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
+    "build": "rm -rf dist && bun build src/index.ts src/workflow.ts --outdir dist --target node --format esm --packages external && tsc -p tsconfig.build.json",
     "type-check": "tsc --noEmit -p tsconfig.json",
-    "test": "bun test"
+    "test": "bun test",
+    "prepack": "bun run build"
   },
   "dependencies": {
-    "@iworkflow/core": "^0.3.0"
+    "@iworkflow/core": "^0.4.0"
   },
   "peerDependencies": {
     "@temporalio/activity": "^1.24.0",
@@ -44,5 +56,8 @@
     "@temporalio/common": "^1.24.0",
     "@temporalio/worker": "^1.24.0",
     "@temporalio/workflow": "^1.24.0"
+  },
+  "engines": {
+    "node": ">=22"
   }
 }

package/src/index.ts

@@ -4,6 +4,7 @@ import { Context } from "@temporalio/activity";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import {
   bindStepRuntime,
+  exitSignal,
   FlowError,
   type Activity,
   type AppDefinition,
@@ -79,11 +80,15 @@ export function temporalRuntime(
   let running: Promise<void>[] = [];
   let conn: NativeConnection | undefined;
   let starting = false;
+  let stopping = false;
+  const exit = exitSignal();
   let stopRenew = () => {};
   return {
     async start(def: AppDefinition) {
       if (starting) throw new Error("воркер уже запущен");
       starting = true;
+      exit.arm();
+      stopping = false;
       bindStepRuntime({
         heartbeat: async (details) => Context.current().heartbeat(details),
         lastHeartbeat: async () => Context.current().info.heartbeatDetails,
@@ -93,6 +98,7 @@ export function temporalRuntime(
         c = conn = await NativeConnection.connect(await connectOptions(opts));
       } catch (e) {
         starting = false;
+        exit.reject(e);
         throw e;
       }
       stopRenew = renewApiKey(opts, (t) => c.setApiKey(t));
@@ -124,11 +130,19 @@ export function temporalRuntime(
         conn = undefined;
         workers = [];
         starting = false;
+        exit.reject(e);
         throw e;
       }
       running = workers.map((w) => w.run());
+      // Воркер упал сам — done() отклоняется сразу, не дожидаясь stop.
+      // Отказ run() во время stop (срок дренажа) — не падение: done() решает stop.
+      // Воркеры погасил сам Runtime (SIGTERM) без stop — тоже конец цикла.
+      void Promise.all(running).then(() => stopping || exit.resolve(), () => {});
+      for (const r of running) r.catch((e) => stopping || exit.reject(e));
     },
+    done: () => exit.promise(),
     async stop() {
+      stopping = true;
       for (const w of workers) if (w.getState() === "RUNNING") w.shutdown();
       // Упавший воркер не мешает закрыть соединение и таймер токена.
       const done = await Promise.allSettled(running);
@@ -140,6 +154,7 @@ export function temporalRuntime(
         workers = [];
         running = [];
         starting = false;
+        exit.resolve();
       }
       const failed = done.find((r) => r.status === "rejected");
       if (failed) throw (failed as PromiseRejectedResult).reason;

package/src/connection.test.ts

@@ -1,34 +0,0 @@
-import { expect, test } from "bun:test";
-import { connectOptions, renewApiKey } from "./connection";
-
-test("токен берётся при подключении и меняется по таймеру", async () => {
-  let n = 0;
-  const apiKey = async () => `t${++n}`;
-  expect(await connectOptions({ address: "a:1", tls: true, apiKey })).toEqual({ address: "a:1", tls: true, apiKey: "t1" });
-  const got: string[] = [];
-  const stop = renewApiKey({ apiKey, apiKeyRenewMs: 10 }, (t) => got.push(t));
-  while (got.length < 2) await Bun.sleep(5);
-  stop();
-  const seen = got.length;
-  await Bun.sleep(25);
-  expect(seen).toBeGreaterThanOrEqual(2);
-  expect(got.length).toBe(seen);
-});
-
-test("без токена и TLS — только адрес", async () => {
-  expect(await connectOptions({ address: "a:1" })).toEqual({ address: "a:1" });
-});
-
-test("медленный запрос не затирает свежий токен, после остановки токен не ставится", async () => {
-  let release!: (t: string) => void;
-  let calls = 0;
-  const apiKey = () => (++calls === 1 ? new Promise<string>((r) => (release = r)) : Promise.resolve(`t${calls}`));
-  const got: string[] = [];
-  const stop = renewApiKey({ apiKey, apiKeyRenewMs: 5 }, (t) => got.push(t));
-  await Bun.sleep(40);
-  expect(calls).toBe(1);
-  stop();
-  release("old");
-  await Bun.sleep(5);
-  expect(got).toEqual([]);
-});