arvo-event-handler 3.0.10 → 3.0.13

package/dist/ArvoMachine/createMachine.js

@@ -25,9 +25,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupArvoMachine = setupArvoMachine;
 var arvo_core_1 = require("arvo-core");
-var uuid_1 = require("uuid");
 var xstate_1 = require("xstate");
 var _1 = __importDefault(require("."));
+var servicesValidation_1 = require("../ArvoOrchestrationUtils/servicesValidation");
 var object_1 = require("../utils/object");
 var utils_1 = require("./utils");
 /**
@@ -194,8 +194,7 @@ var utils_1 = require("./utils");
  * 4. Using XState features like `emit` bound with Arvo contracts for event emitting and event handling via transitions
  */
 function setupArvoMachine(param) {
-    var _a;
-    var _b, _c;
+    var _a, _b;
     var createConfigErrorMessage = function (type) {
         return (0, arvo_core_1.cleanString)("\n      Configuration Error: '".concat(type, "' not supported in Arvo machines\n      \n      Arvo machines do not support XState ").concat(type === 'actor' ? 'actors' : 'delay transitions', " as they introduce asynchronous behavior.\n      \n      To fix:\n      1. Remove the '").concat(type, "' configuration\n      2. Use Arvo's event-driven patterns instead for asynchronous operations\n    "));
     };
@@ -205,18 +204,11 @@ function setupArvoMachine(param) {
     if (param.delays) {
         throw new Error(createConfigErrorMessage('delays'));
     }
-    if ((_b = param.actions) === null || _b === void 0 ? void 0 : _b.enqueueArvoEvent) {
+    if ((_a = param.actions) === null || _a === void 0 ? void 0 : _a.enqueueArvoEvent) {
         throw new Error((0, arvo_core_1.cleanString)("\n        Configuration Error: Reserved action name 'enqueueArvoEvent'\n        \n        'enqueueArvoEvent' is an internal Arvo system action and cannot be overridden.\n        \n        To fix: Use a different name for your action, such as:\n        - 'queueCustomEvent'\n        - 'scheduleEvent'\n        - 'dispatchEvent'\n      "));
     }
-    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 combinedActions = __assign(__assign({}, ((_c = param.actions) !== null && _c !== void 0 ? _c : {})), { enqueueArvoEvent: (0, xstate_1.assign)(function (_a, param) {
+    (0, servicesValidation_1.servicesValidation)(param.contracts, 'machine');
+    var combinedActions = __assign(__assign({}, ((_b = param.actions) !== null && _b !== void 0 ? _b : {})), { enqueueArvoEvent: (0, xstate_1.assign)(function (_a, param) {
             var _b, _c, _d, _e, _f;
             var context = _a.context;
             return (__assign(__assign({}, (context !== null && context !== void 0 ? context : {})), { arvo$$: __assign(__assign({}, ((_b = context === null || context === void 0 ? void 0 : context.arvo$$) !== null && _b !== void 0 ? _b : {})), { volatile$$: __assign(__assign({}, ((_d = (_c = context === null || context === void 0 ? void 0 : context.arvo$$) === null || _c === void 0 ? void 0 : _c.volatile$$) !== null && _d !== void 0 ? _d : {})), { eventQueue$$: __spreadArray(__spreadArray([], (((_f = (_e = context === null || context === void 0 ? void 0 : context.arvo$$) === null || _e === void 0 ? void 0 : _e.volatile$$) === null || _f === void 0 ? void 0 : _f.eventQueue$$) || []), true), [param], false) }) }) }));

package/dist/ArvoMachine/utils.d.ts

@@ -1,4 +1,3 @@
-import type { ArvoContract, VersionedArvoContract } from 'arvo-core';
 import type { MachineConfig } from 'xstate';
 /**
  * Detects if an XState machine configuration contains any parallel states.
@@ -22,19 +21,3 @@ import type { MachineConfig } from 'xstate';
  * const hasParallel = detectParallelStates(machine) // Returns true
  */
 export declare const detectParallelStates: (config?: MachineConfig<any, any, any, any, any, any, any, any, any, any, any>) => boolean;
-/**
- * Validates that all service contracts in a collection have unique URIs.
- *
- * Iterates through the provided contracts and checks if any URI appears more than once.
- * Multiple versions of the same contract (with the same URI) are not allowed.
- *
- * @param contracts - A record mapping contract keys to their respective ArvoContract objects
- * @returns An object with a boolean result indicating if all contracts are unique, and the error keys if not
- */
-export declare const areServiceContractsUnique: (contracts: Record<string, ArvoContract | VersionedArvoContract<any, any>>) => {
-    result: false;
-    keys: [string, string];
-    contractUri: string;
-} | {
-    result: true;
-};

package/dist/ArvoMachine/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.areServiceContractsUnique = exports.detectParallelStates = void 0;
+exports.detectParallelStates = void 0;
 /**
  * Detects if an XState machine configuration contains any parallel states.
  * Uses a stack-based approach for efficient traversal of the state hierarchy.
@@ -41,30 +41,3 @@ var detectParallelStates = function (config) {
     return false;
 };
 exports.detectParallelStates = detectParallelStates;
-/**
- * Validates that all service contracts in a collection have unique URIs.
- *
- * Iterates through the provided contracts and checks if any URI appears more than once.
- * Multiple versions of the same contract (with the same URI) are not allowed.
- *
- * @param contracts - A record mapping contract keys to their respective ArvoContract objects
- * @returns An object with a boolean result indicating if all contracts are unique, and the error keys if not
- */
-var areServiceContractsUnique = function (contracts) {
-    var uriToKeyMap = {};
-    for (var _i = 0, _a = Object.entries(contracts); _i < _a.length; _i++) {
-        var _b = _a[_i], key = _b[0], contract = _b[1];
-        if (uriToKeyMap[contract.uri]) {
-            return {
-                result: false,
-                keys: [key, uriToKeyMap[contract.uri]],
-                contractUri: contract.uri,
-            };
-        }
-        uriToKeyMap[contract.uri] = key;
-    }
-    return {
-        result: true,
-    };
-};
-exports.areServiceContractsUnique = areServiceContractsUnique;

package/dist/ArvoOrchestrationUtils/handlerErrors.d.ts

@@ -22,7 +22,7 @@ export type CreateSystemErrorEventsParams = {
 /**
  * Creates system error events
  */
-export declare const createSystemErrorEvents: ({ error, event, otelHeaders, orchestrationParentSubject, initEventId, selfContract, systemErrorDomain, executionunits, source, domain, handlerType, }: CreateSystemErrorEventsParams & {
+export declare const createSystemErrorEvents: ({ error, event, otelHeaders, orchestrationParentSubject: _orchestrationParentSubject, initEventId, selfContract, systemErrorDomain, executionunits, source, domain, handlerType, }: CreateSystemErrorEventsParams & {
     error: Error;
 }) => ArvoEvent[];
 export declare const handleOrchestrationErrors: (_handlerType: ArvoOrchestrationHandlerType, param: CreateSystemErrorEventsParams & {

package/dist/ArvoOrchestrationUtils/handlerErrors.js

@@ -58,22 +58,26 @@ var types_1 = require("./types");
  * Creates system error events
  */
 var createSystemErrorEvents = function (_a) {
-    var _b, _c, _d, _e;
-    var error = _a.error, event = _a.event, otelHeaders = _a.otelHeaders, orchestrationParentSubject = _a.orchestrationParentSubject, initEventId = _a.initEventId, selfContract = _a.selfContract, systemErrorDomain = _a.systemErrorDomain, executionunits = _a.executionunits, source = _a.source, domain = _a.domain, handlerType = _a.handlerType;
+    var _b, _c, _d, _e, _f;
+    var error = _a.error, event = _a.event, otelHeaders = _a.otelHeaders, _orchestrationParentSubject = _a.orchestrationParentSubject, initEventId = _a.initEventId, selfContract = _a.selfContract, systemErrorDomain = _a.systemErrorDomain, executionunits = _a.executionunits, source = _a.source, domain = _a.domain, handlerType = _a.handlerType;
     // In case of none transaction errors like errors from
     // the machine or the event creation etc, the are workflow
     // error and shuold be handled by the workflow. Then are
     // called system error and must be sent
     // to the initiator. In as good of a format as possible
     var parsedEventSubject = null;
-    try {
-        parsedEventSubject = arvo_core_1.ArvoOrchestrationSubject.parse(event.subject);
-    }
-    catch (e) {
-        (0, arvo_core_1.logToSpan)({
-            level: 'WARNING',
-            message: "Unable to parse event subject: ".concat(e.message),
-        });
+    var orchestrationParentSubject = null;
+    if (handlerType === 'orchestrator' || handlerType === 'resumable') {
+        orchestrationParentSubject = _orchestrationParentSubject;
+        try {
+            parsedEventSubject = arvo_core_1.ArvoOrchestrationSubject.parse(event.subject);
+        }
+        catch (e) {
+            (0, arvo_core_1.logToSpan)({
+                level: 'WARNING',
+                message: "Unable to parse event subject: ".concat(e.message),
+            });
+        }
     }
     var domainSets = new Set(systemErrorDomain
         ? systemErrorDomain.map(function (item) {
@@ -86,8 +90,8 @@ var createSystemErrorEvents = function (_a) {
         })
         : [event.domain, domain, null]);
     var result = [];
-    for (var _i = 0, _f = Array.from(domainSets); _i < _f.length; _i++) {
-        var _dom = _f[_i];
+    for (var _i = 0, _g = Array.from(domainSets); _i < _g.length; _i++) {
+        var _dom = _g[_i];
         var factoryBuilder = handlerType === 'handler' ? arvo_core_1.createArvoEventFactory : arvo_core_1.createArvoOrchestratorEventFactory;
         result.push(factoryBuilder(selfContract).systemError({
             source: source,
@@ -98,11 +102,11 @@ var createSystemErrorEvents = function (_a) {
             subject: orchestrationParentSubject !== null && orchestrationParentSubject !== void 0 ? orchestrationParentSubject : event.subject,
             // The system error must always go back to
             // the source which initiated it
-            to: (_b = parsedEventSubject === null || parsedEventSubject === void 0 ? void 0 : parsedEventSubject.execution.initiator) !== null && _b !== void 0 ? _b : event.source,
+            to: (_c = (_b = parsedEventSubject === null || parsedEventSubject === void 0 ? void 0 : parsedEventSubject.execution) === null || _b === void 0 ? void 0 : _b.initiator) !== null && _c !== void 0 ? _c : event.source,
             error: error,
-            traceparent: (_c = otelHeaders.traceparent) !== null && _c !== void 0 ? _c : undefined,
-            tracestate: (_d = otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined,
-            accesscontrol: (_e = event.accesscontrol) !== null && _e !== void 0 ? _e : undefined,
+            traceparent: (_d = otelHeaders.traceparent) !== null && _d !== void 0 ? _d : undefined,
+            tracestate: (_e = otelHeaders.tracestate) !== null && _e !== void 0 ? _e : undefined,
+            accesscontrol: (_f = event.accesscontrol) !== null && _f !== void 0 ? _f : undefined,
             executionunits: executionunits,
             // If there is initEventID then use that.
             // Otherwise, use event id. If the error is in init event

package/dist/ArvoResumable/index.js

@@ -105,7 +105,7 @@ var ArvoResumable = /** @class */ (function () {
         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 }) });
+        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.RESUMABLE, _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 () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arvo-event-handler",
-  "version": "3.0.10",
+  "version": "3.0.13",
   "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.10",
+    "arvo-core": "^3.0.13",
     "uuid": "^11.1.0",
     "xstate": "^5.23.0",
     "zod": "^3.25.74",