@restatedev/restate-sdk-cloudflare-workers 1.11.0 → 1.12.0

package/dist/endpoint/endpoint.d.cts

@@ -0,0 +1,5 @@
+import "./components.cjs";
+import "../logging/logger_transport.cjs";
+import "../logging/logger.cjs";
+import "../endpoint.cjs";
+import { JournalValueCodec, ServiceDefinition, VirtualObjectDefinition, WorkflowDefinition } from "@restatedev/restate-sdk-core";

package/dist/endpoint/endpoint.d.ts

@@ -0,0 +1,5 @@
+import "./components.js";
+import "../logging/logger_transport.js";
+import "../logging/logger.js";
+import "../endpoint.js";
+import { JournalValueCodec, ServiceDefinition, VirtualObjectDefinition, WorkflowDefinition } from "@restatedev/restate-sdk-core";

package/dist/endpoint/endpoint.js

@@ -1,7 +1,7 @@
-import { LogSource } from "../logging/logger_transport.js";
-import { defaultLoggerTransport } from "../logging/console_logger_transport.js";
 import { HandlerWrapper } from "../types/rpc.js";
 import { ServiceComponent, VirtualObjectComponent, WorkflowComponent } from "./components.js";
+import { LogSource } from "../logging/logger_transport.js";
+import { defaultLoggerTransport } from "../logging/console_logger_transport.js";
 import { createLogger } from "../logging/logger.js";
 
 //#region src/endpoint/endpoint.ts

package/dist/endpoint/endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint.js","names":["name"],"sources":["../../src/endpoint/endpoint.ts"],"sourcesContent":["/*\n * Copyright (c) 2023-2024 - Restate Software, Inc., Restate GmbH\n *\n * This file is part of the Restate SDK for Node.js/TypeScript,\n * which is released under the MIT license.\n *\n * You can find a copy of the license in file LICENSE in the root\n * directory of this repository or package, or at\n * https://github.com/restatedev/sdk-typescript/blob/main/LICENSE\n */\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport type {\n  JournalValueCodec,\n  ServiceDefinition,\n  VirtualObjectDefinition,\n  WorkflowDefinition,\n} from \"@restatedev/restate-sdk-core\";\n\nimport type {\n  ObjectOptions,\n  ServiceOptions,\n  WorkflowOptions,\n} from \"../types/rpc.js\";\nimport { HandlerWrapper } from \"../types/rpc.js\";\nimport type { Component } from \"./components.js\";\nimport {\n  ServiceComponent,\n  VirtualObjectComponent,\n  WorkflowComponent,\n} from \"./components.js\";\nimport type * as discovery from \"./discovery.js\";\nimport { defaultLoggerTransport } from \"../logging/console_logger_transport.js\";\nimport {\n  type LoggerTransport,\n  LogSource,\n} from \"../logging/logger_transport.js\";\nimport type { Logger } from \"../logging/logger.js\";\nimport { createLogger } from \"../logging/logger.js\";\nimport type { DefaultServiceOptions } from \"../endpoint.js\";\n\nfunction isServiceDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is ServiceDefinition<P, M> & { service: M } {\n  return m && m.service !== undefined;\n}\n\nfunction isObjectDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is VirtualObjectDefinition<P, M> & { object: M } {\n  return m && m.object !== undefined;\n}\n\nfunction isWorkflowDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is WorkflowDefinition<P, M> & { workflow: M } {\n  return m && m.workflow !== undefined;\n}\n\n/**\n * Services can have additional information that is not part of the definition.\n * For example a description or metadata.\n */\ntype ServiceAuxInfo = {\n  description?: string;\n  metadata?: Record<string, any>;\n  options?: ServiceOptions | ObjectOptions | WorkflowOptions;\n};\n\nexport type Endpoint = {\n  loggerTransport: LoggerTransport;\n  components: Map<string, Component>;\n  keySet: string[];\n  /**\n   * This is a simple console without contextual info.\n   *\n   * This should be used only in cases where no contextual info is available.\n   */\n  rlog: Logger;\n  /**\n   * All discovery metadata, except protocol mode provided by the node/fetch/lambda endpoint implementations\n   */\n  discoveryMetadata: Omit<discovery.Endpoint, \"protocolMode\">;\n\n  /**\n   * Codec provider to use for journal values.\n   */\n  journalValueCodec?: Promise<JournalValueCodec>;\n};\n\nexport class EndpointBuilder {\n  private readonly serviceDefinitions: Map<\n    string,\n    | ServiceDefinition<string, any>\n    | VirtualObjectDefinition<string, any>\n    | WorkflowDefinition<string, any>\n  > = new Map();\n  private loggerTransport: LoggerTransport = defaultLoggerTransport;\n  private keySet: string[] = [];\n  private defaultServiceOptions: DefaultServiceOptions = {};\n  private journalValueCodecProvider?: () => Promise<JournalValueCodec>;\n\n  public bind<P extends string, M>(\n    definition:\n      | ServiceDefinition<P, M>\n      | VirtualObjectDefinition<P, M>\n      | WorkflowDefinition<P, M>\n  ) {\n    // Validate service name\n    if (definition.name.indexOf(\"/\") !== -1) {\n      throw new Error(\"service name must not contain any slash '/'\");\n    }\n\n    this.serviceDefinitions.set(definition.name, definition);\n  }\n\n  public addIdentityKeys(...keys: string[]) {\n    this.keySet.push(...keys);\n  }\n\n  public setDefaultServiceOptions(options: DefaultServiceOptions) {\n    this.defaultServiceOptions = options;\n  }\n\n  public setLogger(newLogger: LoggerTransport) {\n    this.loggerTransport = newLogger;\n  }\n\n  public setJournalValueCodecProvider(\n    codecProvider: () => Promise<JournalValueCodec>\n  ) {\n    this.journalValueCodecProvider = codecProvider;\n  }\n\n  public build(): Endpoint {\n    const rlog = createLogger(this.loggerTransport, LogSource.SYSTEM);\n\n    // Build the components\n    const components = new Map<string, Component>();\n    for (const [name, definition] of this.serviceDefinitions) {\n      if (isServiceDefinition(definition)) {\n        const { name, service } = definition;\n        if (!service) {\n          throw new TypeError(`no service implementation found.`);\n        }\n        components.set(\n          name,\n          buildServiceComponent(\n            name,\n            service,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else if (isObjectDefinition(definition)) {\n        const { name, object } = definition;\n        if (!object) {\n          throw new TypeError(`no object implementation found.`);\n        }\n        components.set(\n          name,\n          buildVirtualObjectComponent(\n            name,\n            object,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else if (isWorkflowDefinition(definition)) {\n        const { name, workflow } = definition;\n        if (!workflow) {\n          throw new TypeError(`no workflow implementation found.`);\n        }\n        components.set(\n          name,\n          buildWorkflowComponent(\n            name,\n            workflow,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else {\n        throw new TypeError(\n          `cannot bind ${name}, can only bind a service or a virtual object or a workflow definition`\n        );\n      }\n    }\n\n    // Compute discovery metadata\n    const discoveryMetadata = computeDiscovery(components);\n\n    return {\n      keySet: this.keySet,\n      loggerTransport: this.loggerTransport,\n      rlog,\n      components,\n      discoveryMetadata,\n      journalValueCodec: this.journalValueCodecProvider\n        ? this.journalValueCodecProvider()\n        : undefined,\n    };\n  }\n}\n\nfunction computeDiscovery(\n  components: Map<string, Component>\n): discovery.Endpoint {\n  return {\n    minProtocolVersion: 5,\n    maxProtocolVersion: 6,\n    services: [...components.values()].map((c) => c.discovery()),\n  };\n}\n\nfunction buildServiceComponent(\n  name: string,\n  router: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): ServiceComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new ServiceComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as ServiceOptions),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    router as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(router);\n    component.add(route, wrapper);\n  }\n\n  return component;\n}\n\nfunction buildVirtualObjectComponent(\n  name: string,\n  router: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): VirtualObjectComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new VirtualObjectComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as ObjectOptions),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    router as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(router);\n    component.add(route, wrapper);\n  }\n  return component;\n}\n\nfunction buildWorkflowComponent(\n  name: string,\n  workflow: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): WorkflowComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new WorkflowComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as WorkflowOptions),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    workflow as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(workflow);\n    component.add(route, wrapper);\n  }\n  return component;\n}\n"],"mappings":";;;;;;;AA0CA,SAAS,oBACP,GAC+C;AAC/C,QAAO,KAAK,EAAE,YAAY;;AAG5B,SAAS,mBACP,GACoD;AACpD,QAAO,KAAK,EAAE,WAAW;;AAG3B,SAAS,qBACP,GACiD;AACjD,QAAO,KAAK,EAAE,aAAa;;AAkC7B,IAAa,kBAAb,MAA6B;CAC3B,AAAiB,qCAKb,IAAI,KAAK;CACb,AAAQ,kBAAmC;CAC3C,AAAQ,SAAmB,EAAE;CAC7B,AAAQ,wBAA+C,EAAE;CACzD,AAAQ;CAER,AAAO,KACL,YAIA;AAEA,MAAI,WAAW,KAAK,QAAQ,IAAI,KAAK,GACnC,OAAM,IAAI,MAAM,8CAA8C;AAGhE,OAAK,mBAAmB,IAAI,WAAW,MAAM,WAAW;;CAG1D,AAAO,gBAAgB,GAAG,MAAgB;AACxC,OAAK,OAAO,KAAK,GAAG,KAAK;;CAG3B,AAAO,yBAAyB,SAAgC;AAC9D,OAAK,wBAAwB;;CAG/B,AAAO,UAAU,WAA4B;AAC3C,OAAK,kBAAkB;;CAGzB,AAAO,6BACL,eACA;AACA,OAAK,4BAA4B;;CAGnC,AAAO,QAAkB;EACvB,MAAM,OAAO,aAAa,KAAK,iBAAiB,UAAU,OAAO;EAGjE,MAAM,6BAAa,IAAI,KAAwB;AAC/C,OAAK,MAAM,CAAC,MAAM,eAAe,KAAK,mBACpC,KAAI,oBAAoB,WAAW,EAAE;GACnC,MAAM,EAAE,cAAM,YAAY;AAC1B,OAAI,CAAC,QACH,OAAM,IAAI,UAAU,mCAAmC;AAEzD,cAAW,IACTA,QACA,sBACEA,QACA,SACA,YACA,KAAK,sBACN,CACF;aACQ,mBAAmB,WAAW,EAAE;GACzC,MAAM,EAAE,cAAM,WAAW;AACzB,OAAI,CAAC,OACH,OAAM,IAAI,UAAU,kCAAkC;AAExD,cAAW,IACTA,QACA,4BACEA,QACA,QACA,YACA,KAAK,sBACN,CACF;aACQ,qBAAqB,WAAW,EAAE;GAC3C,MAAM,EAAE,cAAM,aAAa;AAC3B,OAAI,CAAC,SACH,OAAM,IAAI,UAAU,oCAAoC;AAE1D,cAAW,IACTA,QACA,uBACEA,QACA,UACA,YACA,KAAK,sBACN,CACF;QAED,OAAM,IAAI,UACR,eAAe,KAAK,wEACrB;EAKL,MAAM,oBAAoB,iBAAiB,WAAW;AAEtD,SAAO;GACL,QAAQ,KAAK;GACb,iBAAiB,KAAK;GACtB;GACA;GACA;GACA,mBAAmB,KAAK,4BACpB,KAAK,2BAA2B,GAChC;GACL;;;AAIL,SAAS,iBACP,YACoB;AACpB,QAAO;EACL,oBAAoB;EACpB,oBAAoB;EACpB,UAAU,CAAC,GAAG,WAAW,QAAQ,CAAC,CAAC,KAAK,MAAM,EAAE,WAAW,CAAC;EAC7D;;AAGH,SAAS,sBACP,MACA,QACA,YACA,uBACkB;AAClB,KAAI,KAAK,QAAQ,IAAI,KAAK,GACxB,OAAM,IAAI,MAAM,8CAA8C;CAEhE,MAAM,YAAY,IAAI,iBACpB,MACA,WAAW,aACX,WAAW,UACX;EACE,GAAG;EACH,GAAI,YAAY;EACjB,CACF;AAED,MAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QACpC,OACD,EAAE;EACD,MAAM,UAAU,eAAe,YAAY,QAAQ;AACnD,MAAI,CAAC,QACH,OAAM,IAAI,UAAU,GAAG,MAAM,4BAA4B;AAE3D,UAAQ,aAAa,OAAO;AAC5B,YAAU,IAAI,OAAO,QAAQ;;AAG/B,QAAO;;AAGT,SAAS,4BACP,MACA,QACA,YACA,uBACwB;AACxB,KAAI,KAAK,QAAQ,IAAI,KAAK,GACxB,OAAM,IAAI,MAAM,8CAA8C;CAEhE,MAAM,YAAY,IAAI,uBACpB,MACA,WAAW,aACX,WAAW,UACX;EACE,GAAG;EACH,GAAI,YAAY;EACjB,CACF;AAED,MAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QACpC,OACD,EAAE;EACD,MAAM,UAAU,eAAe,YAAY,QAAQ;AACnD,MAAI,CAAC,QACH,OAAM,IAAI,UAAU,GAAG,MAAM,4BAA4B;AAE3D,UAAQ,aAAa,OAAO;AAC5B,YAAU,IAAI,OAAO,QAAQ;;AAE/B,QAAO;;AAGT,SAAS,uBACP,MACA,UACA,YACA,uBACmB;AACnB,KAAI,KAAK,QAAQ,IAAI,KAAK,GACxB,OAAM,IAAI,MAAM,8CAA8C;CAEhE,MAAM,YAAY,IAAI,kBACpB,MACA,WAAW,aACX,WAAW,UACX;EACE,GAAG;EACH,GAAI,YAAY;EACjB,CACF;AAED,MAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QACpC,SACD,EAAE;EACD,MAAM,UAAU,eAAe,YAAY,QAAQ;AACnD,MAAI,CAAC,QACH,OAAM,IAAI,UAAU,GAAG,MAAM,4BAA4B;AAE3D,UAAQ,aAAa,SAAS;AAC9B,YAAU,IAAI,OAAO,QAAQ;;AAE/B,QAAO"}
+{"version":3,"file":"endpoint.js","names":["name"],"sources":["../../src/endpoint/endpoint.ts"],"sourcesContent":["/*\n * Copyright (c) 2023-2024 - Restate Software, Inc., Restate GmbH\n *\n * This file is part of the Restate SDK for Node.js/TypeScript,\n * which is released under the MIT license.\n *\n * You can find a copy of the license in file LICENSE in the root\n * directory of this repository or package, or at\n * https://github.com/restatedev/sdk-typescript/blob/main/LICENSE\n */\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport type {\n  JournalValueCodec,\n  ServiceDefinition,\n  VirtualObjectDefinition,\n  WorkflowDefinition,\n} from \"@restatedev/restate-sdk-core\";\n\nimport type {\n  ObjectOptions,\n  ServiceOptions,\n  WorkflowOptions,\n} from \"../types/rpc.js\";\nimport { HandlerWrapper } from \"../types/rpc.js\";\nimport type { Component } from \"./components.js\";\nimport {\n  ServiceComponent,\n  VirtualObjectComponent,\n  WorkflowComponent,\n} from \"./components.js\";\nimport type * as discovery from \"./discovery.js\";\nimport { defaultLoggerTransport } from \"../logging/console_logger_transport.js\";\nimport {\n  type LoggerTransport,\n  LogSource,\n} from \"../logging/logger_transport.js\";\nimport type { Logger } from \"../logging/logger.js\";\nimport { createLogger } from \"../logging/logger.js\";\nimport type { DefaultServiceOptions } from \"../endpoint.js\";\n\nfunction isServiceDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is ServiceDefinition<P, M> & { service: M } {\n  return m && m.service !== undefined;\n}\n\nfunction isObjectDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is VirtualObjectDefinition<P, M> & { object: M } {\n  return m && m.object !== undefined;\n}\n\nfunction isWorkflowDefinition<P extends string, M>(\n  m: Record<string, any>\n): m is WorkflowDefinition<P, M> & { workflow: M } {\n  return m && m.workflow !== undefined;\n}\n\n/**\n * Services can have additional information that is not part of the definition.\n * For example a description or metadata.\n */\ntype ServiceAuxInfo = {\n  description?: string;\n  metadata?: Record<string, any>;\n  options?: ServiceOptions | ObjectOptions | WorkflowOptions;\n};\n\nexport type Endpoint = {\n  loggerTransport: LoggerTransport;\n  components: Map<string, Component>;\n  keySet: string[];\n  /**\n   * This is a simple console without contextual info.\n   *\n   * This should be used only in cases where no contextual info is available.\n   */\n  rlog: Logger;\n  /**\n   * All discovery metadata, except protocol mode provided by the node/fetch/lambda endpoint implementations\n   */\n  discoveryMetadata: Omit<discovery.Endpoint, \"protocolMode\">;\n\n  /**\n   * Codec provider to use for journal values.\n   */\n  journalValueCodec?: Promise<JournalValueCodec>;\n};\n\nexport class EndpointBuilder {\n  private readonly serviceDefinitions: Map<\n    string,\n    | ServiceDefinition<string, any>\n    | VirtualObjectDefinition<string, any>\n    | WorkflowDefinition<string, any>\n  > = new Map();\n  private loggerTransport: LoggerTransport = defaultLoggerTransport;\n  private keySet: string[] = [];\n  private defaultServiceOptions: DefaultServiceOptions = {};\n  private journalValueCodecProvider?: () => Promise<JournalValueCodec>;\n\n  public bind<P extends string, M>(\n    definition:\n      | ServiceDefinition<P, M>\n      | VirtualObjectDefinition<P, M>\n      | WorkflowDefinition<P, M>\n  ) {\n    // Validate service name\n    if (definition.name.indexOf(\"/\") !== -1) {\n      throw new Error(\"service name must not contain any slash '/'\");\n    }\n\n    this.serviceDefinitions.set(definition.name, definition);\n  }\n\n  public addIdentityKeys(...keys: string[]) {\n    this.keySet.push(...keys);\n  }\n\n  public setDefaultServiceOptions(options: DefaultServiceOptions) {\n    this.defaultServiceOptions = options;\n  }\n\n  public setLogger(newLogger: LoggerTransport) {\n    this.loggerTransport = newLogger;\n  }\n\n  public setJournalValueCodecProvider(\n    codecProvider: () => Promise<JournalValueCodec>\n  ) {\n    this.journalValueCodecProvider = codecProvider;\n  }\n\n  public build(): Endpoint {\n    const rlog = createLogger(this.loggerTransport, LogSource.SYSTEM);\n\n    // Build the components\n    const components = new Map<string, Component>();\n    for (const [name, definition] of this.serviceDefinitions) {\n      if (isServiceDefinition(definition)) {\n        const { name, service } = definition;\n        if (!service) {\n          throw new TypeError(`no service implementation found.`);\n        }\n        components.set(\n          name,\n          buildServiceComponent(\n            name,\n            service,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else if (isObjectDefinition(definition)) {\n        const { name, object } = definition;\n        if (!object) {\n          throw new TypeError(`no object implementation found.`);\n        }\n        components.set(\n          name,\n          buildVirtualObjectComponent(\n            name,\n            object,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else if (isWorkflowDefinition(definition)) {\n        const { name, workflow } = definition;\n        if (!workflow) {\n          throw new TypeError(`no workflow implementation found.`);\n        }\n        components.set(\n          name,\n          buildWorkflowComponent(\n            name,\n            workflow,\n            definition as ServiceAuxInfo,\n            this.defaultServiceOptions\n          )\n        );\n      } else {\n        throw new TypeError(\n          `cannot bind ${name}, can only bind a service or a virtual object or a workflow definition`\n        );\n      }\n    }\n\n    // Compute discovery metadata\n    const discoveryMetadata = computeDiscovery(components);\n\n    return {\n      keySet: this.keySet,\n      loggerTransport: this.loggerTransport,\n      rlog,\n      components,\n      discoveryMetadata,\n      journalValueCodec: this.journalValueCodecProvider\n        ? this.journalValueCodecProvider()\n        : undefined,\n    };\n  }\n}\n\nfunction computeDiscovery(\n  components: Map<string, Component>\n): discovery.Endpoint {\n  return {\n    minProtocolVersion: 5,\n    maxProtocolVersion: 6,\n    services: [...components.values()].map((c) => c.discovery()),\n  };\n}\n\nfunction buildServiceComponent(\n  name: string,\n  router: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): ServiceComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new ServiceComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as ServiceOptions | undefined),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    router as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(router);\n    component.add(route, wrapper);\n  }\n\n  return component;\n}\n\nfunction buildVirtualObjectComponent(\n  name: string,\n  router: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): VirtualObjectComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new VirtualObjectComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as ObjectOptions | undefined),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    router as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(router);\n    component.add(route, wrapper);\n  }\n  return component;\n}\n\nfunction buildWorkflowComponent(\n  name: string,\n  workflow: any,\n  definition: ServiceAuxInfo,\n  defaultServiceOptions: DefaultServiceOptions\n): WorkflowComponent {\n  if (name.indexOf(\"/\") !== -1) {\n    throw new Error(\"service name must not contain any slash '/'\");\n  }\n  const component = new WorkflowComponent(\n    name,\n    definition.description,\n    definition.metadata,\n    {\n      ...defaultServiceOptions,\n      ...(definition?.options as WorkflowOptions | undefined),\n    }\n  );\n\n  for (const [route, handler] of Object.entries(\n    workflow as { [s: string]: any }\n  )) {\n    const wrapper = HandlerWrapper.fromHandler(handler);\n    if (!wrapper) {\n      throw new TypeError(`${route} is not a restate handler.`);\n    }\n    wrapper.bindInstance(workflow);\n    component.add(route, wrapper);\n  }\n  return component;\n}\n"],"mappings":"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"}

package/dist/endpoint/handlers/generic.cjs

@@ -1,21 +1,23 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
-const require_logger_transport = require('../../logging/logger_transport.cjs');
-const require_console_logger_transport = require('../../logging/console_logger_transport.cjs');
-const require_core_logging = require('./core_logging.cjs');
-const require_sdk_shared_core_wasm_bindings = require('./vm/sdk_shared_core_wasm_bindings.cjs');
 const require_errors = require('../../types/errors.cjs');
-const require_rpc = require('../../types/rpc.cjs');
 const require_completable_promise = require('../../utils/completable_promise.cjs');
-const require_context_impl = require('../../context_impl.cjs');
+const require_rpc = require('../../types/rpc.cjs');
 const require_components = require('../components.cjs');
+const require_logger_transport = require('../../logging/logger_transport.cjs');
+const require_console_logger_transport = require('../../logging/console_logger_transport.cjs');
 const require_logger = require('../../logging/logger.cjs');
 const require_user_agent = require('../../user_agent.cjs');
+const require_core_logging = require('./core_logging.cjs');
+const require_sdk_shared_core_wasm_bindings = require('./vm/sdk_shared_core_wasm_bindings.cjs');
+const require_context_impl = require('../../context_impl.cjs');
+const require_error_sanitization = require('../../error_sanitization.cjs');
 const require_utils = require('./utils.cjs');
 const require_discovery = require('./discovery.cjs');
 let __restatedev_restate_sdk_core = require("@restatedev/restate-sdk-core");
 __restatedev_restate_sdk_core = require_rolldown_runtime.__toESM(__restatedev_restate_sdk_core);
 
 //#region src/endpoint/handlers/generic.ts
+const HOOK_CONTEXT_IS_PROCESSING_SYMBOL = Symbol.for("@restatedev/restate-sdk/hooks.isProcessing");
 function createRestateHandler(endpoint, protocolMode, additionalDiscoveryFields) {
 	return new RestateHandlerImpl(endpoint, protocolMode, additionalDiscoveryFields);
 }
@@ -110,7 +112,7 @@ var RestateInvokeResponse = class {
 		this.loggerId = Math.floor(Math.random() * 4294967295);
 		const isJournalCodecDefined = this.journalValueCodecInit !== void 0;
 		const vmHeaders = Object.entries(this.attemptHeaders).filter(([, v]) => v !== void 0).map(([k, v]) => new require_sdk_shared_core_wasm_bindings.WasmHeader(k, v instanceof Array ? v[0] : v));
-		this.coreVm = new require_sdk_shared_core_wasm_bindings.WasmVM(vmHeaders, restateLogLevelToWasmLogLevel(require_console_logger_transport.DEFAULT_CONSOLE_LOGGER_LOG_LEVEL), this.loggerId, isJournalCodecDefined);
+		this.coreVm = new require_sdk_shared_core_wasm_bindings.WasmVM(vmHeaders, restateLogLevelToWasmLogLevel(require_console_logger_transport.DEFAULT_CONSOLE_LOGGER_LOG_LEVEL), this.loggerId, isJournalCodecDefined, handler.executionOptions.explicitCancellation ?? false);
 		const responseHead = this.coreVm.get_response_head();
 		this.statusCode = responseHead.status_code;
 		this.headers = responseHead.headers.reduce((headers, { key, value }) => ({
@@ -134,6 +136,14 @@ var RestateInvokeResponse = class {
 			await bufferJournalReplayInCoreVm(this.coreVm, inputReader);
 			const input = this.coreVm.sys_input();
 			const invocationRequest = {
+				target: {
+					service: this.service.name(),
+					handler: this.handler.name(),
+					key: input.key || void 0,
+					toString() {
+						return this.key !== void 0 ? `${this.service}/${this.key}/${this.handler}` : `${this.service}/${this.handler}`;
+					}
+				},
 				id: input.invocation_id,
 				headers: input.headers.reduce((headers, { key, value }) => {
 					headers.set(key, value);
@@ -153,18 +163,26 @@ var RestateInvokeResponse = class {
 			require_core_logging.registerLogger(this.loggerId, this.vmLogger);
 			if (!this.coreVm.is_processing()) this.vmLogger.info("Replaying invocation.");
 			else this.vmLogger.info("Starting invocation.");
-			ctx = new require_context_impl.ContextImpl(this.coreVm, input, ctxLogger, this.handler.kind(), this.vmLogger, invocationRequest, invocationEndPromise, inputReader, outputWriter, journalValueCodec, this.service.options?.serde, this.service.options?.asTerminalError);
+			ctx = new require_context_impl.ContextImpl(this.coreVm, input, ctxLogger, this.handler.kind(), this.vmLogger, invocationRequest, invocationEndPromise, inputReader, outputWriter, journalValueCodec, this.handler.executionOptions);
 		} catch (e) {
 			const error = require_errors.ensureError(e);
 			this.coreVm.notify_error(error.message, error.message);
 			await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
 			return;
 		}
-		startUserHandler(ctx, this.service, this.handler, journalValueCodec).finally(() => {
-			invocationEndPromise.resolve();
-		});
-		await invocationEndPromise.promise;
-		await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
+		abortSignal.addEventListener("abort", () => {
+			setImmediate(() => {
+				const msg = "Connection closed";
+				this.coreVm.notify_error(msg, msg);
+			});
+		}, { once: true });
+		try {
+			await startUserHandler(ctx, this.service, this.handler, journalValueCodec);
+		} catch (e) {
+			notifyError(e, ctx, this.handler.executionOptions.asTerminalError);
+		} finally {
+			await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
+		}
 	}
 };
 async function bufferJournalReplayInCoreVm(coreVm, inputReader) {
@@ -178,35 +196,57 @@ async function bufferJournalReplayInCoreVm(coreVm, inputReader) {
 	}
 }
 async function startUserHandler(ctx, service, handler, journalValueCodec) {
+	const hooks = [];
+	for (const provider of handler.executionOptions.hooks ?? []) {
+		const hookContext = { request: ctx.request() };
+		Object.defineProperty(hookContext, HOOK_CONTEXT_IS_PROCESSING_SYMBOL, {
+			value: () => ctx.isProcessing(),
+			enumerable: false
+		});
+		hooks.push(provider(hookContext));
+	}
+	const handlerInterceptor = composeInterceptors(hooks.map((h) => h.interceptor?.handler).filter(isDefined));
+	ctx.setRunInterceptor(composeInterceptors(hooks.map((h) => h.interceptor?.run).filter(isDefined)));
+	let encodedOutput;
+	await raceWithAttemptEnd(ctx, handlerInterceptor)(async () => {
+		const decodedInput = await journalValueCodec.decode(ctx.request().body).catch((e) => Promise.reject(new require_errors.TerminalError(`Failed to decode input using journal value codec: ${require_errors.ensureError(e).message}`, { errorCode: 400 })));
+		const output = await handler.invoke(ctx, decodedInput);
+		encodedOutput = journalValueCodec.encode(output);
+	});
+	ctx.coreVm.sys_write_output_success(encodedOutput);
+	ctx.coreVm.sys_end();
+	ctx.vmLogger.info("Invocation completed successfully.");
+}
+/**
+* Classifies the error and notifies the VM. Called from the process() catch
+* block — the single place that decides how to report errors to the VM.
+*/
+function notifyError(e, ctx, asTerminalError) {
+	if (e instanceof require_context_impl.CommandError) {
+		const cause = require_errors.ensureError(e.cause);
+		require_errors.logError(ctx.vmLogger, cause);
+		if (e.hasCommandIndex) ctx.coreVm.notify_error_for_specific_command(cause.message, cause.stack, e.commandType, e.commandIndex, null);
+		else ctx.coreVm.notify_error_for_next_command(cause.message, cause.stack, e.commandType);
+		return;
+	}
+	const error = require_errors.ensureError(e, asTerminalError);
+	require_errors.logError(ctx.vmLogger, error);
 	try {
-		try {
-			const decodedInput = await journalValueCodec.decode(ctx.request().body).catch((e) => Promise.reject(new require_errors.TerminalError(`Failed to decode input using journal value codec: ${require_errors.ensureError(e).message}`, { errorCode: 400 })));
-			const output = await handler.invoke(ctx, decodedInput);
-			const encodedOutput = journalValueCodec.encode(output);
-			ctx.coreVm.sys_write_output_success(encodedOutput);
+		if (error instanceof require_errors.TerminalError) {
+			ctx.coreVm.sys_write_output_failure({
+				code: error.code,
+				message: error.message,
+				metadata: Object.entries(error.metadata ?? {}).map(([key, value]) => ({
+					key,
+					value
+				}))
+			});
 			ctx.coreVm.sys_end();
-			ctx.vmLogger.info("Invocation completed successfully.");
-		} catch (e) {
-			const error = require_errors.ensureError(e, service.options?.asTerminalError);
-			require_errors.logError(ctx.vmLogger, error);
-			if (error instanceof require_errors.TerminalError) {
-				ctx.coreVm.sys_write_output_failure({
-					code: error.code,
-					message: error.message,
-					metadata: Object.entries(error.metadata ?? {}).map(([key, value]) => ({
-						key,
-						value
-					}))
-				});
-				ctx.coreVm.sys_end();
-				return;
-			}
-			throw error;
-		}
-	} catch (e) {
-		const error = require_errors.ensureError(e);
-		if (error instanceof require_errors.RetryableError) ctx.coreVm.notify_error_with_delay_override(error.message, error.stack, error.retryAfter !== void 0 ? BigInt((0, __restatedev_restate_sdk_core.millisOrDurationToMillis)(error.retryAfter)) : void 0);
+		} else if (error instanceof require_errors.RetryableError) ctx.coreVm.notify_error_with_delay_override(error.message, error.stack, error.retryAfter !== void 0 ? BigInt((0, __restatedev_restate_sdk_core.millisOrDurationToMillis)(error.retryAfter)) : void 0);
 		else ctx.coreVm.notify_error(error.message, error.stack);
+	} catch (vmError) {
+		const inner = require_errors.ensureError(vmError);
+		ctx.coreVm.notify_error(inner.message, inner.stack);
 	}
 }
 async function flushAndClose(coreVm, vmLogger, inputReader, outputWriter) {
@@ -234,6 +274,42 @@ async function flushAndClose(coreVm, vmLogger, inputReader, outputWriter) {
 function isAbortErrorOnWrite(error) {
 	return error.name === "AbortError" || error.message === "Invalid state: WritableStream is closed" || error.code === "ERR_HTTP2_INVALID_STREAM";
 }
+function composeInterceptors(interceptors) {
+	return interceptors.reduceRight((innerInterceptor, interceptor) => (...args) => {
+		const context = args.slice(0, -1);
+		const callback = args.at(-1);
+		return interceptor(...context, () => innerInterceptor(...context, callback));
+	}, (...args) => args.at(-1)());
+}
+/**
+* Wraps an interceptor so that both `next()` and the interceptor body race
+* against `invocationEndPromise`. When the attempt ends (suspension, retryable
+* error, etc.), the promise rejects and the interceptor chain unwinds through
+* catch/finally blocks — preventing interceptors from hanging on a `next()`
+* that will never settle.
+*
+* SDK-internal metadata (CommandError, retryAfter) is stripped before the
+* interceptor sees the error and restored after the chain exits.
+*/
+function raceWithAttemptEnd(ctx, interceptor) {
+	return (...args) => {
+		let originalError;
+		const signal = ctx.invocationEndPromise.promise.catch((e) => {
+			originalError = e;
+			throw require_error_sanitization.sanitizeError(e);
+		});
+		const originalNext = args.at(-1);
+		const racingNext = () => Promise.race([originalNext(), signal]);
+		const newArgs = [...args.slice(0, -1), racingNext];
+		return Promise.race([interceptor(...newArgs), signal]).catch((e) => {
+			if (originalError !== void 0) throw require_error_sanitization.restoreError(e, originalError);
+			throw e;
+		});
+	};
+}
+function isDefined(value) {
+	return value != null;
+}
 function restateLogLevelToWasmLogLevel(level) {
 	switch (level) {
 		case require_logger_transport.RestateLogLevel.TRACE: return require_sdk_shared_core_wasm_bindings.LogLevel.TRACE;

package/dist/endpoint/handlers/generic.js

@@ -1,19 +1,21 @@
-import { LogSource, LoggerContext, RestateLogLevel } from "../../logging/logger_transport.js";
-import { DEFAULT_CONSOLE_LOGGER_LOG_LEVEL } from "../../logging/console_logger_transport.js";
-import { destroyLogger, registerLogger } from "./core_logging.js";
-import { LogLevel, WasmHeader, WasmIdentityVerifier, WasmVM, set_log_level } from "./vm/sdk_shared_core_wasm_bindings.js";
 import { RestateError, RetryableError, TerminalError, ensureError, logError } from "../../types/errors.js";
-import { HandlerKind } from "../../types/rpc.js";
 import { CompletablePromise } from "../../utils/completable_promise.js";
-import { ContextImpl } from "../../context_impl.js";
+import { HandlerKind } from "../../types/rpc.js";
 import { parseUrlComponents } from "../components.js";
+import { LogSource, LoggerContext, RestateLogLevel } from "../../logging/logger_transport.js";
+import { DEFAULT_CONSOLE_LOGGER_LOG_LEVEL } from "../../logging/console_logger_transport.js";
 import { createLogger } from "../../logging/logger.js";
 import { X_RESTATE_SERVER } from "../../user_agent.js";
+import { destroyLogger, registerLogger } from "./core_logging.js";
+import { LogLevel, WasmHeader, WasmIdentityVerifier, WasmVM, set_log_level } from "./vm/sdk_shared_core_wasm_bindings.js";
+import { CommandError, ContextImpl } from "../../context_impl.js";
+import { restoreError, sanitizeError } from "../../error_sanitization.js";
 import { errorResponse, invocationIdFromHeaders, simpleResponse, tryCreateContextualLogger } from "./utils.js";
 import { handleDiscovery } from "./discovery.js";
 import { millisOrDurationToMillis } from "@restatedev/restate-sdk-core";
 
 //#region src/endpoint/handlers/generic.ts
+const HOOK_CONTEXT_IS_PROCESSING_SYMBOL = Symbol.for("@restatedev/restate-sdk/hooks.isProcessing");
 function createRestateHandler(endpoint, protocolMode, additionalDiscoveryFields) {
 	return new RestateHandlerImpl(endpoint, protocolMode, additionalDiscoveryFields);
 }
@@ -108,7 +110,7 @@ var RestateInvokeResponse = class {
 		this.loggerId = Math.floor(Math.random() * 4294967295);
 		const isJournalCodecDefined = this.journalValueCodecInit !== void 0;
 		const vmHeaders = Object.entries(this.attemptHeaders).filter(([, v]) => v !== void 0).map(([k, v]) => new WasmHeader(k, v instanceof Array ? v[0] : v));
-		this.coreVm = new WasmVM(vmHeaders, restateLogLevelToWasmLogLevel(DEFAULT_CONSOLE_LOGGER_LOG_LEVEL), this.loggerId, isJournalCodecDefined);
+		this.coreVm = new WasmVM(vmHeaders, restateLogLevelToWasmLogLevel(DEFAULT_CONSOLE_LOGGER_LOG_LEVEL), this.loggerId, isJournalCodecDefined, handler.executionOptions.explicitCancellation ?? false);
 		const responseHead = this.coreVm.get_response_head();
 		this.statusCode = responseHead.status_code;
 		this.headers = responseHead.headers.reduce((headers, { key, value }) => ({
@@ -132,6 +134,14 @@ var RestateInvokeResponse = class {
 			await bufferJournalReplayInCoreVm(this.coreVm, inputReader);
 			const input = this.coreVm.sys_input();
 			const invocationRequest = {
+				target: {
+					service: this.service.name(),
+					handler: this.handler.name(),
+					key: input.key || void 0,
+					toString() {
+						return this.key !== void 0 ? `${this.service}/${this.key}/${this.handler}` : `${this.service}/${this.handler}`;
+					}
+				},
 				id: input.invocation_id,
 				headers: input.headers.reduce((headers, { key, value }) => {
 					headers.set(key, value);
@@ -151,18 +161,26 @@ var RestateInvokeResponse = class {
 			registerLogger(this.loggerId, this.vmLogger);
 			if (!this.coreVm.is_processing()) this.vmLogger.info("Replaying invocation.");
 			else this.vmLogger.info("Starting invocation.");
-			ctx = new ContextImpl(this.coreVm, input, ctxLogger, this.handler.kind(), this.vmLogger, invocationRequest, invocationEndPromise, inputReader, outputWriter, journalValueCodec, this.service.options?.serde, this.service.options?.asTerminalError);
+			ctx = new ContextImpl(this.coreVm, input, ctxLogger, this.handler.kind(), this.vmLogger, invocationRequest, invocationEndPromise, inputReader, outputWriter, journalValueCodec, this.handler.executionOptions);
 		} catch (e) {
 			const error = ensureError(e);
 			this.coreVm.notify_error(error.message, error.message);
 			await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
 			return;
 		}
-		startUserHandler(ctx, this.service, this.handler, journalValueCodec).finally(() => {
-			invocationEndPromise.resolve();
-		});
-		await invocationEndPromise.promise;
-		await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
+		abortSignal.addEventListener("abort", () => {
+			setImmediate(() => {
+				const msg = "Connection closed";
+				this.coreVm.notify_error(msg, msg);
+			});
+		}, { once: true });
+		try {
+			await startUserHandler(ctx, this.service, this.handler, journalValueCodec);
+		} catch (e) {
+			notifyError(e, ctx, this.handler.executionOptions.asTerminalError);
+		} finally {
+			await flushAndClose(this.coreVm, this.vmLogger, inputReader, outputWriter);
+		}
 	}
 };
 async function bufferJournalReplayInCoreVm(coreVm, inputReader) {
@@ -176,35 +194,57 @@ async function bufferJournalReplayInCoreVm(coreVm, inputReader) {
 	}
 }
 async function startUserHandler(ctx, service, handler, journalValueCodec) {
+	const hooks = [];
+	for (const provider of handler.executionOptions.hooks ?? []) {
+		const hookContext = { request: ctx.request() };
+		Object.defineProperty(hookContext, HOOK_CONTEXT_IS_PROCESSING_SYMBOL, {
+			value: () => ctx.isProcessing(),
+			enumerable: false
+		});
+		hooks.push(provider(hookContext));
+	}
+	const handlerInterceptor = composeInterceptors(hooks.map((h) => h.interceptor?.handler).filter(isDefined));
+	ctx.setRunInterceptor(composeInterceptors(hooks.map((h) => h.interceptor?.run).filter(isDefined)));
+	let encodedOutput;
+	await raceWithAttemptEnd(ctx, handlerInterceptor)(async () => {
+		const decodedInput = await journalValueCodec.decode(ctx.request().body).catch((e) => Promise.reject(new TerminalError(`Failed to decode input using journal value codec: ${ensureError(e).message}`, { errorCode: 400 })));
+		const output = await handler.invoke(ctx, decodedInput);
+		encodedOutput = journalValueCodec.encode(output);
+	});
+	ctx.coreVm.sys_write_output_success(encodedOutput);
+	ctx.coreVm.sys_end();
+	ctx.vmLogger.info("Invocation completed successfully.");
+}
+/**
+* Classifies the error and notifies the VM. Called from the process() catch
+* block — the single place that decides how to report errors to the VM.
+*/
+function notifyError(e, ctx, asTerminalError) {
+	if (e instanceof CommandError) {
+		const cause = ensureError(e.cause);
+		logError(ctx.vmLogger, cause);
+		if (e.hasCommandIndex) ctx.coreVm.notify_error_for_specific_command(cause.message, cause.stack, e.commandType, e.commandIndex, null);
+		else ctx.coreVm.notify_error_for_next_command(cause.message, cause.stack, e.commandType);
+		return;
+	}
+	const error = ensureError(e, asTerminalError);
+	logError(ctx.vmLogger, error);
 	try {
-		try {
-			const decodedInput = await journalValueCodec.decode(ctx.request().body).catch((e) => Promise.reject(new TerminalError(`Failed to decode input using journal value codec: ${ensureError(e).message}`, { errorCode: 400 })));
-			const output = await handler.invoke(ctx, decodedInput);
-			const encodedOutput = journalValueCodec.encode(output);
-			ctx.coreVm.sys_write_output_success(encodedOutput);
+		if (error instanceof TerminalError) {
+			ctx.coreVm.sys_write_output_failure({
+				code: error.code,
+				message: error.message,
+				metadata: Object.entries(error.metadata ?? {}).map(([key, value]) => ({
+					key,
+					value
+				}))
+			});
 			ctx.coreVm.sys_end();
-			ctx.vmLogger.info("Invocation completed successfully.");
-		} catch (e) {
-			const error = ensureError(e, service.options?.asTerminalError);
-			logError(ctx.vmLogger, error);
-			if (error instanceof TerminalError) {
-				ctx.coreVm.sys_write_output_failure({
-					code: error.code,
-					message: error.message,
-					metadata: Object.entries(error.metadata ?? {}).map(([key, value]) => ({
-						key,
-						value
-					}))
-				});
-				ctx.coreVm.sys_end();
-				return;
-			}
-			throw error;
-		}
-	} catch (e) {
-		const error = ensureError(e);
-		if (error instanceof RetryableError) ctx.coreVm.notify_error_with_delay_override(error.message, error.stack, error.retryAfter !== void 0 ? BigInt(millisOrDurationToMillis(error.retryAfter)) : void 0);
+		} else if (error instanceof RetryableError) ctx.coreVm.notify_error_with_delay_override(error.message, error.stack, error.retryAfter !== void 0 ? BigInt(millisOrDurationToMillis(error.retryAfter)) : void 0);
 		else ctx.coreVm.notify_error(error.message, error.stack);
+	} catch (vmError) {
+		const inner = ensureError(vmError);
+		ctx.coreVm.notify_error(inner.message, inner.stack);
 	}
 }
 async function flushAndClose(coreVm, vmLogger, inputReader, outputWriter) {
@@ -232,6 +272,42 @@ async function flushAndClose(coreVm, vmLogger, inputReader, outputWriter) {
 function isAbortErrorOnWrite(error) {
 	return error.name === "AbortError" || error.message === "Invalid state: WritableStream is closed" || error.code === "ERR_HTTP2_INVALID_STREAM";
 }
+function composeInterceptors(interceptors) {
+	return interceptors.reduceRight((innerInterceptor, interceptor) => (...args) => {
+		const context = args.slice(0, -1);
+		const callback = args.at(-1);
+		return interceptor(...context, () => innerInterceptor(...context, callback));
+	}, (...args) => args.at(-1)());
+}
+/**
+* Wraps an interceptor so that both `next()` and the interceptor body race
+* against `invocationEndPromise`. When the attempt ends (suspension, retryable
+* error, etc.), the promise rejects and the interceptor chain unwinds through
+* catch/finally blocks — preventing interceptors from hanging on a `next()`
+* that will never settle.
+*
+* SDK-internal metadata (CommandError, retryAfter) is stripped before the
+* interceptor sees the error and restored after the chain exits.
+*/
+function raceWithAttemptEnd(ctx, interceptor) {
+	return (...args) => {
+		let originalError;
+		const signal = ctx.invocationEndPromise.promise.catch((e) => {
+			originalError = e;
+			throw sanitizeError(e);
+		});
+		const originalNext = args.at(-1);
+		const racingNext = () => Promise.race([originalNext(), signal]);
+		const newArgs = [...args.slice(0, -1), racingNext];
+		return Promise.race([interceptor(...newArgs), signal]).catch((e) => {
+			if (originalError !== void 0) throw restoreError(e, originalError);
+			throw e;
+		});
+	};
+}
+function isDefined(value) {
+	return value != null;
+}
 function restateLogLevelToWasmLogLevel(level) {
 	switch (level) {
 		case RestateLogLevel.TRACE: return LogLevel.TRACE;