arvo-event-handler 3.0.8 → 3.0.11

package/dist/ArvoResumable/factory.js

@@ -1,20 +1,8 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createArvoResumable = void 0;
-var uuid_1 = require("uuid");
 var _1 = require(".");
-var utils_1 = require("../ArvoMachine/utils");
+var servicesValidation_1 = require("../ArvoOrchestrationUtils/servicesValidation");
 /**
  * Factory function for creating ArvoResumable orchestrator instances
  *
@@ -40,23 +28,16 @@ var utils_1 = require("../ArvoMachine/utils");
  * @throws {Error} Circular dependency detected - Self contract is registered as a service, creating execution loops
  */
 var createArvoResumable = function (param) {
-    var _a;
-    var _b, _c;
-    var __areServiceContractsUnique = (0, utils_1.areServiceContractsUnique)(param.contracts.services);
-    if (!__areServiceContractsUnique.result) {
-        throw new Error("The service contracts must have unique URIs. Multiple versions of the same contract are not allow. The contracts '".concat(__areServiceContractsUnique.keys[0], "' and '").concat(__areServiceContractsUnique.keys[1], "' have the same URI '").concat(__areServiceContractsUnique.contractUri, "'"));
-    }
-    var __checkIfSelfIsAService = (0, utils_1.areServiceContractsUnique)(__assign(__assign({}, param.contracts.services), (_a = {}, _a[(0, uuid_1.v4)()] = param.contracts.self, _a)));
-    if (!__checkIfSelfIsAService.result) {
-        throw new Error("Circular dependency detected: Machine with URI '".concat(param.contracts.self.uri, "' is registered as service '").concat(__checkIfSelfIsAService.keys[1], "'. Self-referential services create execution loops and are prohibited."));
-    }
+    var _a, _b;
+    (0, servicesValidation_1.servicesValidation)(param.contracts, 'resumable');
     return new _1.ArvoResumable({
         contracts: param.contracts,
         memory: param.memory,
         handler: param.handler,
-        executionunits: (_b = param.executionunits) !== null && _b !== void 0 ? _b : 0,
-        requiresResourceLocking: (_c = param.requiresResourceLocking) !== null && _c !== void 0 ? _c : Object.keys(param.contracts.services).length > 1,
+        executionunits: (_a = param.executionunits) !== null && _a !== void 0 ? _a : 0,
+        requiresResourceLocking: (_b = param.requiresResourceLocking) !== null && _b !== void 0 ? _b : Object.keys(param.contracts.services).length > 1,
         systemErrorDomain: param.systemErrorDomain,
+        spanOptions: param.spanOptions,
     });
 };
 exports.createArvoResumable = createArvoResumable;

package/dist/ArvoResumable/index.d.ts

@@ -1,10 +1,10 @@
-import type { Span } from '@opentelemetry/api';
+import { type Span } from '@opentelemetry/api';
 import { type ArvoEvent, type ArvoOrchestratorContract, type VersionedArvoContract } from 'arvo-core';
 import type { z } from 'zod';
 import type IArvoEventHandler from '../IArvoEventHandler';
 import type { IMachineMemory } from '../MachineMemory/interface';
 import { SyncEventResource } from '../SyncEventResource/index';
-import type { ArvoEventHandlerOpenTelemetryOptions } from '../types';
+import type { ArvoEventHandlerOpenTelemetryOptions, ArvoEventHandlerOtelSpanOptions } from '../types';
 import type { ArvoResumableHandler, ArvoResumableState } from './types';
 /**
  * ArvoResumable - A stateful orchestration handler for managing distributed workflows
@@ -43,6 +43,7 @@ export declare class ArvoResumable<TMemory extends Record<string, any> = Record<
     readonly source: string;
     readonly handler: ArvoResumableHandler<ArvoResumableState<TMemory>, TSelfContract, TServiceContract>;
     readonly systemErrorDomain?: (string | null)[];
+    private readonly spanOptions;
     readonly contracts: {
         self: TSelfContract;
         services: TServiceContract;
@@ -60,6 +61,7 @@ export declare class ArvoResumable<TMemory extends Record<string, any> = Record<
         requiresResourceLocking?: boolean;
         handler: ArvoResumableHandler<ArvoResumableState<TMemory>, TSelfContract, TServiceContract>;
         systemErrorDomain?: (string | null)[];
+        spanOptions?: ArvoEventHandlerOtelSpanOptions;
     });
     protected validateInput(event: ArvoEvent, span: Span): {
         contractType: 'self' | 'service';
@@ -77,7 +79,7 @@ export declare class ArvoResumable<TMemory extends Record<string, any> = Record<
      * @throws {ContractViolation} When event schema validation fails
      * @throws {ExecutionViolation} When workflow execution encounters critical errors
      */
-    execute(event: ArvoEvent, opentelemetry: ArvoEventHandlerOpenTelemetryOptions): Promise<{
+    execute(event: ArvoEvent, opentelemetry?: ArvoEventHandlerOpenTelemetryOptions): Promise<{
         events: ArvoEvent[];
     }>;
     get systemErrorSchema(): import("arvo-core").ArvoContractRecord<`sys.arvo.orc.${string}.error`, z.ZodObject<{

package/dist/ArvoResumable/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,6 +57,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArvoResumable = void 0;
+var api_1 = require("@opentelemetry/api");
 var arvo_core_1 = require("arvo-core");
 var createEmitableEvent_1 = require("../ArvoOrchestrationUtils/createEmitableEvent");
 var orchestrationExecutionWrapper_1 = require("../ArvoOrchestrationUtils/orchestrationExecutionWrapper");
@@ -85,13 +97,15 @@ var errors_1 = require("../errors");
 var ArvoResumable = /** @class */ (function () {
     function ArvoResumable(param) {
         var _a;
+        var _b, _c, _d;
         this.systemErrorDomain = [];
         this.executionunits = param.executionunits;
         this.source = param.contracts.self.type;
-        this.syncEventResource = new index_1.SyncEventResource(param.memory, (_a = param.requiresResourceLocking) !== null && _a !== void 0 ? _a : true);
+        this.syncEventResource = new index_1.SyncEventResource(param.memory, (_b = param.requiresResourceLocking) !== null && _b !== void 0 ? _b : true);
         this.contracts = param.contracts;
         this.handler = param.handler;
         this.systemErrorDomain = param.systemErrorDomain;
+        this.spanOptions = __assign(__assign({ kind: api_1.SpanKind.PRODUCER }, param.spanOptions), { attributes: __assign(__assign((_a = {}, _a[arvo_core_1.ArvoExecution.ATTR_SPAN_KIND] = arvo_core_1.ArvoExecutionSpanKind.ORCHESTRATOR, _a[arvo_core_1.OpenInference.ATTR_SPAN_KIND] = arvo_core_1.OpenInferenceSpanKind.CHAIN, _a), ((_d = (_c = param.spanOptions) === null || _c === void 0 ? void 0 : _c.attributes) !== null && _d !== void 0 ? _d : {})), { 'arvo.handler.source': this.source, 'arvo.contract.uri': this.contracts.self.uri }) });
     }
     Object.defineProperty(ArvoResumable.prototype, "requiresResourceLocking", {
         get: function () {
@@ -183,8 +197,11 @@ var ArvoResumable = /** @class */ (function () {
                     case 0: return [4 /*yield*/, (0, orchestrationExecutionWrapper_1.executeWithOrchestrationWrapper)({
                             _handlerType: 'resumable',
                             event: event,
-                            opentelemetry: opentelemetry,
-                            spanName: "Resumable<".concat(this.contracts.self.uri, ">@<").concat(event.type, ">"),
+                            opentelemetry: opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : { inheritFrom: 'EVENT' },
+                            spanOptions: __assign({ spanName: function (_a) {
+                                    var selfContractUri = _a.selfContractUri, consumedEvent = _a.consumedEvent;
+                                    return "Resumable<".concat(selfContractUri, ">@<").concat(consumedEvent.type, ">");
+                                } }, this.spanOptions),
                             source: this.source,
                             syncEventResource: this.syncEventResource,
                             executionunits: this.executionunits,

package/dist/IArvoEventHandler/index.d.ts

@@ -21,7 +21,7 @@ export default interface IArvoEventHandler {
      * @returns A promise that resolves to an array of resulting Arvo events.
      * These events represent the outcome of processing the input event.
      */
-    execute(event: ArvoEvent, opentelemetry: ArvoEventHandlerOpenTelemetryOptions): Promise<{
+    execute(event: ArvoEvent, opentelemetry?: ArvoEventHandlerOpenTelemetryOptions): Promise<{
         events: ArvoEvent[];
     }>;
     /**

package/dist/index.d.ts

@@ -6,7 +6,8 @@ import { ArvoEventHandlerFunction, ArvoEventHandlerFunctionInput, ArvoEventHandl
 import ArvoMachine from './ArvoMachine';
 import { setupArvoMachine } from './ArvoMachine/createMachine';
 import { ArvoMachineContext, EnqueueArvoEventActionParam } from './ArvoMachine/types';
-import { isTransactionViolationError, TransactionViolation, TransactionViolationCause } from './ArvoOrchestrationUtils/error';
+import { TransactionViolation, TransactionViolationCause, isTransactionViolationError } from './ArvoOrchestrationUtils/error';
+import { OrchestrationExecutionStatus } from './ArvoOrchestrationUtils/orchestrationExecutionState';
 import { ArvoOrchestrator } from './ArvoOrchestrator';
 import { createArvoOrchestrator } from './ArvoOrchestrator/factory';
 import { ArvoOrchestratorParam, MachineMemoryRecord } from './ArvoOrchestrator/types';
@@ -23,13 +24,12 @@ import { IMachineMemory } from './MachineMemory/interface';
 import { MachineRegistry } from './MachineRegistry';
 import { IMachineRegistry } from './MachineRegistry/interface';
 import { ConfigViolation, ContractViolation, ExecutionViolation } from './errors';
-import { ArvoEventHandlerOpenTelemetryOptions, EventHandlerFactory, PartialExcept } from './types';
+import { ArvoEventHandlerOpenTelemetryOptions, ArvoEventHandlerOtelSpanOptions, EventHandlerFactory, PartialExcept } from './types';
 import { coalesce, coalesceOrDefault, getValueOrDefault, isNullOrUndefined } from './utils';
 import { SimpleEventBroker } from './utils/SimpleEventBroker';
 import { createSimpleEventBroker } from './utils/SimpleEventBroker/helper';
-import { OrchestrationExecutionStatus } from './ArvoOrchestrationUtils/orchestrationExecutionState';
 declare const xstate: {
     emit: typeof emit;
     assign: typeof assign;
 };
-export { ArvoEventHandler, createArvoEventHandler, IArvoEventHandler, ArvoEventHandlerFunctionOutput, ArvoEventHandlerFunctionInput, ArvoEventHandlerFunction, PartialExcept, isNullOrUndefined, getValueOrDefault, coalesce, coalesceOrDefault, ArvoEventHandlerOpenTelemetryOptions, EventHandlerFactory, ContractViolation, ConfigViolation, ExecutionViolation, ArvoMachine, setupArvoMachine, ArvoMachineContext, EnqueueArvoEventActionParam, IMachineRegistry, MachineRegistry, MachineExecutionEngine, IMachineExectionEngine, ExecuteMachineInput, ExecuteMachineOutput, IMachineMemory, SimpleMachineMemory, MachineMemoryRecord, ArvoOrchestratorParam, TransactionViolation, TransactionViolationCause, ArvoOrchestrator, createArvoOrchestrator, SimpleEventBroker, createSimpleEventBroker, TelemetredSimpleMachineMemory, xstate, ArvoResumable, createArvoResumable, ArvoResumableHandler, ArvoResumableState, ArvoDomain, resolveEventDomain, isTransactionViolationError, OrchestrationExecutionStatus };
+export { ArvoEventHandler, createArvoEventHandler, IArvoEventHandler, ArvoEventHandlerFunctionOutput, ArvoEventHandlerFunctionInput, ArvoEventHandlerFunction, PartialExcept, isNullOrUndefined, getValueOrDefault, coalesce, coalesceOrDefault, ArvoEventHandlerOpenTelemetryOptions, EventHandlerFactory, ContractViolation, ConfigViolation, ExecutionViolation, ArvoMachine, setupArvoMachine, ArvoMachineContext, EnqueueArvoEventActionParam, IMachineRegistry, MachineRegistry, MachineExecutionEngine, IMachineExectionEngine, ExecuteMachineInput, ExecuteMachineOutput, IMachineMemory, SimpleMachineMemory, MachineMemoryRecord, ArvoOrchestratorParam, TransactionViolation, TransactionViolationCause, ArvoOrchestrator, createArvoOrchestrator, SimpleEventBroker, createSimpleEventBroker, TelemetredSimpleMachineMemory, xstate, ArvoResumable, createArvoResumable, ArvoResumableHandler, ArvoResumableState, ArvoDomain, resolveEventDomain, isTransactionViolationError, OrchestrationExecutionStatus, ArvoEventHandlerOtelSpanOptions, };

package/dist/index.js

@@ -17,9 +17,11 @@ exports.ArvoMachine = ArvoMachine_1.default;
 var createMachine_1 = require("./ArvoMachine/createMachine");
 Object.defineProperty(exports, "setupArvoMachine", { enumerable: true, get: function () { return createMachine_1.setupArvoMachine; } });
 var error_1 = require("./ArvoOrchestrationUtils/error");
-Object.defineProperty(exports, "isTransactionViolationError", { enumerable: true, get: function () { return error_1.isTransactionViolationError; } });
 Object.defineProperty(exports, "TransactionViolation", { enumerable: true, get: function () { return error_1.TransactionViolation; } });
 Object.defineProperty(exports, "TransactionViolationCause", { enumerable: true, get: function () { return error_1.TransactionViolationCause; } });
+Object.defineProperty(exports, "isTransactionViolationError", { enumerable: true, get: function () { return error_1.isTransactionViolationError; } });
+var orchestrationExecutionState_1 = require("./ArvoOrchestrationUtils/orchestrationExecutionState");
+Object.defineProperty(exports, "OrchestrationExecutionStatus", { enumerable: true, get: function () { return orchestrationExecutionState_1.OrchestrationExecutionStatus; } });
 var ArvoOrchestrator_1 = require("./ArvoOrchestrator");
 Object.defineProperty(exports, "ArvoOrchestrator", { enumerable: true, get: function () { return ArvoOrchestrator_1.ArvoOrchestrator; } });
 var factory_1 = require("./ArvoOrchestrator/factory");
@@ -49,8 +51,6 @@ var SimpleEventBroker_1 = require("./utils/SimpleEventBroker");
 Object.defineProperty(exports, "SimpleEventBroker", { enumerable: true, get: function () { return SimpleEventBroker_1.SimpleEventBroker; } });
 var helper_1 = require("./utils/SimpleEventBroker/helper");
 Object.defineProperty(exports, "createSimpleEventBroker", { enumerable: true, get: function () { return helper_1.createSimpleEventBroker; } });
-var orchestrationExecutionState_1 = require("./ArvoOrchestrationUtils/orchestrationExecutionState");
-Object.defineProperty(exports, "OrchestrationExecutionStatus", { enumerable: true, get: function () { return orchestrationExecutionState_1.OrchestrationExecutionStatus; } });
 var xstate = {
     emit: xstate_1.emit,
     assign: xstate_1.assign,

package/dist/types.d.ts

@@ -1,3 +1,5 @@
+import type { SpanOptions } from '@opentelemetry/api';
+import type { ArvoEvent } from 'arvo-core';
 import type IArvoEventHandler from './IArvoEventHandler';
 /**
  * Makes properties optional except specified keys
@@ -30,3 +32,9 @@ export type ArvoEventHandlerOpenTelemetryOptions = {
  * @template T - Configuration object type
  */
 export type EventHandlerFactory<T = void> = T extends void ? () => IArvoEventHandler : (config: T) => IArvoEventHandler;
+export type ArvoEventHandlerOtelSpanOptions = SpanOptions & {
+    spanName?: (param: {
+        selfContractUri: string;
+        consumedEvent: ArvoEvent;
+    }) => string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arvo-event-handler",
-  "version": "3.0.8",
+  "version": "3.0.11",
   "description": "Type-safe event handler system with versioning, telemetry, and contract validation for distributed Arvo event-driven architectures, featuring routing and multi-handler support.",
   "main": "dist/index.js",
   "scripts": {
@@ -46,7 +46,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.30.1",
-    "arvo-core": "^3.0.8",
+    "arvo-core": "^3.0.11",
     "uuid": "^11.1.0",
     "xstate": "^5.23.0",
     "zod": "^3.25.74",