@cadenza.io/service 2.17.13 → 2.17.15

package/dist/index.d.mts

@@ -276,7 +276,10 @@ declare class ServiceRegistry {
     collectTransportDiagnosticsTask: Task;
     collectReadinessTask: Task;
     private buildRemoteIntentDeputyKey;
+    private readArrayPayload;
+    private normalizeSignalMaps;
     private normalizeIntentMaps;
+    private normalizeServiceInstancesFromSync;
     private registerRemoteIntentDeputy;
     private unregisterRemoteIntentDeputy;
     getInquiryResponderDescriptor(task: Task): InquiryResponderDescriptor;

package/dist/index.d.ts

@@ -276,7 +276,10 @@ declare class ServiceRegistry {
     collectTransportDiagnosticsTask: Task;
     collectReadinessTask: Task;
     private buildRemoteIntentDeputyKey;
+    private readArrayPayload;
+    private normalizeSignalMaps;
     private normalizeIntentMaps;
+    private normalizeServiceInstancesFromSync;
     private registerRemoteIntentDeputy;
     private unregisterRemoteIntentDeputy;
     getInquiryResponderDescriptor(task: Task): InquiryResponderDescriptor;

package/dist/index.js

@@ -433,16 +433,16 @@ function normalizeServiceTransportConfig(value) {
 }
 function normalizeServiceTransportDescriptor(value) {
   const raw = value ?? {};
-  const uuid6 = normalizeString(raw.uuid);
+  const uuid7 = normalizeString(raw.uuid);
   const serviceInstanceId = normalizeString(
     raw.serviceInstanceId ?? raw.service_instance_id
   );
   const config = normalizeServiceTransportConfig(raw);
-  if (!uuid6 || !serviceInstanceId || !config) {
+  if (!uuid7 || !serviceInstanceId || !config) {
     return null;
   }
   return {
-    uuid: uuid6,
+    uuid: uuid7,
     serviceInstanceId,
     role: config.role,
     origin: config.origin,
@@ -504,14 +504,14 @@ function normalizeTransportArray(value, serviceInstanceId) {
 }
 function normalizeServiceInstanceDescriptor(value) {
   const raw = value ?? {};
-  const uuid6 = normalizeString2(raw.uuid);
+  const uuid7 = normalizeString2(raw.uuid);
   const serviceName = normalizeString2(raw.serviceName ?? raw.service_name);
-  if (!uuid6 || !serviceName) {
+  if (!uuid7 || !serviceName) {
     return null;
   }
-  const transports = normalizeTransportArray(raw.transports, uuid6);
+  const transports = normalizeTransportArray(raw.transports, uuid7);
   return {
-    uuid: uuid6,
+    uuid: uuid7,
     serviceName,
     numberOfRunningGraphs: Math.max(
       0,
@@ -542,6 +542,22 @@ function getRouteableTransport(instance, role, protocol) {
   return selectTransportForRole(instance.transports ?? [], role, protocol);
 }
 
+// src/utils/delegation.ts
+var import_uuid2 = require("uuid");
+function ensureDelegationContextMetadata(input) {
+  const context = input && typeof input === "object" ? { ...input } : {};
+  const metadata = context.__metadata && typeof context.__metadata === "object" ? { ...context.__metadata } : {};
+  const deputyExecId = typeof metadata.__deputyExecId === "string" && metadata.__deputyExecId.length > 0 ? metadata.__deputyExecId : typeof context.__deputyExecId === "string" && context.__deputyExecId.length > 0 ? context.__deputyExecId : (0, import_uuid2.v4)();
+  return {
+    ...context,
+    __deputyExecId: deputyExecId,
+    __metadata: {
+      ...metadata,
+      __deputyExecId: deputyExecId
+    }
+  };
+}
+
 // src/utils/readiness.ts
 function evaluateDependencyReadiness(input) {
   const missedHeartbeats = Math.max(
@@ -954,15 +970,15 @@ var ServiceRegistry = class _ServiceRegistry {
         if (!serviceInstance) {
           return false;
         }
-        const uuid6 = serviceInstance.uuid;
+        const uuid7 = serviceInstance.uuid;
         const serviceName = serviceInstance.serviceName;
         const deleted = Boolean(
           ctx.deleted ?? ctx.serviceInstance?.deleted ?? ctx.data?.deleted
         );
-        if (uuid6 === this.serviceInstanceId) return;
+        if (uuid7 === this.serviceInstanceId) return;
         if (deleted) {
-          const existingInstance = this.instances.get(serviceName)?.find((instance) => instance.uuid === uuid6);
-          const indexToDelete = this.instances.get(serviceName)?.findIndex((i) => i.uuid === uuid6) ?? -1;
+          const existingInstance = this.instances.get(serviceName)?.find((instance) => instance.uuid === uuid7);
+          const indexToDelete = this.instances.get(serviceName)?.findIndex((i) => i.uuid === uuid7) ?? -1;
           if (indexToDelete >= 0 && existingInstance) {
             this.instances.get(serviceName)?.splice(indexToDelete, 1);
             for (const transport of existingInstance.transports) {
@@ -974,13 +990,13 @@ var ServiceRegistry = class _ServiceRegistry {
           if (this.instances.get(serviceName)?.length === 0) {
             this.instances.delete(serviceName);
           }
-          this.unregisterDependee(uuid6, serviceName);
+          this.unregisterDependee(uuid7, serviceName);
           return;
         }
         if (!this.instances.has(serviceName))
           this.instances.set(serviceName, []);
         const instances = this.instances.get(serviceName);
-        const existing = instances.find((i) => i.uuid === uuid6);
+        const existing = instances.find((i) => i.uuid === uuid7);
         if (existing) {
           Object.assign(existing, {
             ...serviceInstance,
@@ -990,7 +1006,7 @@ var ServiceRegistry = class _ServiceRegistry {
         } else {
           instances.push(serviceInstance);
         }
-        const trackedInstance = existing ?? instances.find((instance) => instance.uuid === uuid6);
+        const trackedInstance = existing ?? instances.find((instance) => instance.uuid === uuid7);
         if (trackedInstance) {
           const snapshot = this.resolveRuntimeStatusSnapshot(
             trackedInstance.numberOfRunningGraphs ?? 0,
@@ -1003,7 +1019,7 @@ var ServiceRegistry = class _ServiceRegistry {
           trackedInstance.reportedAt = trackedInstance.reportedAt ?? (/* @__PURE__ */ new Date()).toISOString();
         }
         if (!serviceInstance.isBootstrapPlaceholder) {
-          this.reconcileBootstrapPlaceholderInstance(serviceName, uuid6, emit);
+          this.reconcileBootstrapPlaceholderInstance(serviceName, uuid7, emit);
         }
         if (this.serviceName === serviceName) {
           return false;
@@ -1029,7 +1045,7 @@ var ServiceRegistry = class _ServiceRegistry {
             if (!clientCreated) {
               emit("meta.service_registry.dependee_registered", {
                 serviceName,
-                serviceInstanceId: uuid6,
+                serviceInstanceId: uuid7,
                 serviceTransportId: trackedTransport.uuid,
                 serviceOrigin: trackedTransport.origin,
                 transportProtocols: trackedTransport.protocols,
@@ -1043,7 +1059,7 @@ var ServiceRegistry = class _ServiceRegistry {
           } else {
             emit("meta.service_registry.routeable_transport_missing", {
               serviceName,
-              serviceInstanceId: uuid6,
+              serviceInstanceId: uuid7,
               requiredRole: this.getRoutingTransportRole(),
               isFrontend: this.isFrontend
             });
@@ -1167,8 +1183,7 @@ var ServiceRegistry = class _ServiceRegistry {
     this.handleGlobalSignalRegistrationTask = CadenzaService.createMetaTask(
       "Handle global Signal Registration",
       (ctx) => {
-        const { signalToTaskMaps } = ctx;
-        const sortedSignalToTaskMap = signalToTaskMaps.sort(
+        const sortedSignalToTaskMap = this.normalizeSignalMaps(ctx).sort(
           (a, b) => {
             if (a.deleted && !b.deleted) return -1;
             if (!a.deleted && b.deleted) return 1;
@@ -1406,22 +1421,14 @@ var ServiceRegistry = class _ServiceRegistry {
           },
           ctx.inquiryOptions ?? ctx.__inquiryOptions ?? {}
         );
-        const signalToTaskMaps = (inquiryResult.signalToTaskMaps ?? []).filter((m) => !!m.isGlobal).map((m) => ({
-          signalName: m.signalName,
-          serviceName: m.serviceName,
-          deleted: !!m.deleted
-        }));
-        const intentToTaskMaps = (inquiryResult.intentToTaskMaps ?? []).map(
-          (m) => ({
-            intentName: m.intentName,
-            taskName: m.taskName,
-            taskVersion: m.taskVersion ?? 1,
-            serviceName: m.serviceName,
-            deleted: !!m.deleted
-          })
+        const signalToTaskMaps = this.normalizeSignalMaps(
+          inquiryResult
+        ).filter((m) => !!m.isGlobal);
+        const intentToTaskMaps = this.normalizeIntentMaps(
+          inquiryResult
         );
-        const serviceInstances = (inquiryResult.serviceInstances ?? []).map((instance) => normalizeServiceInstanceDescriptor(instance)).filter(
-          (instance) => !!instance && !!instance.isActive && !instance.isNonResponsive && !instance.isBlocked
+        const serviceInstances = this.normalizeServiceInstancesFromSync(
+          inquiryResult
         );
         return {
           ...ctx,
@@ -1506,6 +1513,9 @@ var ServiceRegistry = class _ServiceRegistry {
     this.getBalancedInstance = CadenzaService.createMetaTask(
       "Get balanced instance",
       (context, emit) => {
+        if (context.__remoteRoutineName !== void 0) {
+          context = ensureDelegationContextMetadata(context);
+        }
         const {
           __serviceName,
           __triedInstances,
@@ -2244,9 +2254,47 @@ var ServiceRegistry = class _ServiceRegistry {
   buildRemoteIntentDeputyKey(map) {
     return `${map.intentName}|${map.serviceName}|${map.taskName}|${map.taskVersion ?? 1}`;
   }
+  readArrayPayload(ctx, keys) {
+    for (const key of keys) {
+      const value = ctx?.[key];
+      if (Array.isArray(value)) {
+        return value;
+      }
+    }
+    if (Array.isArray(ctx?.rows)) {
+      return ctx.rows;
+    }
+    if (Array.isArray(ctx?.data)) {
+      return ctx.data;
+    }
+    return [];
+  }
+  normalizeSignalMaps(ctx) {
+    return this.readArrayPayload(ctx, [
+      "signalToTaskMaps",
+      "signal_to_task_maps",
+      "signalToTaskMap",
+      "signal_to_task_map"
+    ]).map((map) => ({
+      signalName: String(
+        map.signalName ?? map.signal_name ?? ""
+      ).trim(),
+      serviceName: String(
+        map.serviceName ?? map.service_name ?? ""
+      ).trim(),
+      isGlobal: Boolean(map.isGlobal ?? map.is_global ?? false),
+      deleted: Boolean(map.deleted)
+    })).filter((map) => map.signalName && map.serviceName);
+  }
   normalizeIntentMaps(ctx) {
-    if (Array.isArray(ctx.intentToTaskMaps)) {
-      return ctx.intentToTaskMaps.map((m) => ({
+    const arrayPayload = this.readArrayPayload(ctx, [
+      "intentToTaskMaps",
+      "intent_to_task_maps",
+      "intentToTaskMap",
+      "intent_to_task_map"
+    ]);
+    if (arrayPayload.length > 0) {
+      return arrayPayload.map((m) => ({
         intentName: m.intentName ?? m.intent_name,
         serviceName: m.serviceName ?? m.service_name,
         taskName: m.taskName ?? m.task_name,
@@ -2254,7 +2302,7 @@ var ServiceRegistry = class _ServiceRegistry {
         deleted: !!m.deleted
       })).filter((m) => m.intentName && m.serviceName && m.taskName);
     }
-    const single = ctx.intentToTaskMap ?? ctx.data ?? (ctx.intentName ? ctx : void 0);
+    const single = ctx.intentToTaskMap ?? ctx.intent_to_task_map ?? ctx.data ?? (ctx.intentName ? ctx : void 0);
     if (!single) return [];
     const normalized = {
       intentName: single.intentName ?? single.intent_name,
@@ -2267,6 +2315,40 @@ var ServiceRegistry = class _ServiceRegistry {
       return [];
     return [normalized];
   }
+  normalizeServiceInstancesFromSync(ctx) {
+    const rawTransports = this.readArrayPayload(ctx, [
+      "serviceInstanceTransports",
+      "service_instance_transports",
+      "serviceInstanceTransport",
+      "service_instance_transport"
+    ]).map((transport) => normalizeServiceTransportDescriptor(transport)).filter(
+      (transport) => !!transport && !transport.deleted
+    );
+    const transportsByInstance = /* @__PURE__ */ new Map();
+    for (const transport of rawTransports) {
+      if (!transportsByInstance.has(transport.serviceInstanceId)) {
+        transportsByInstance.set(transport.serviceInstanceId, []);
+      }
+      transportsByInstance.get(transport.serviceInstanceId).push(transport);
+    }
+    return this.readArrayPayload(ctx, [
+      "serviceInstances",
+      "service_instances",
+      "serviceInstance",
+      "service_instance"
+    ]).map(
+      (instance) => normalizeServiceInstanceDescriptor({
+        ...instance,
+        transports: Array.isArray(instance?.transports) && instance.transports.length > 0 ? instance.transports : transportsByInstance.get(
+          String(
+            instance?.uuid ?? instance?.serviceInstanceId ?? instance?.service_instance_id ?? ""
+          ).trim()
+        ) ?? []
+      })
+    ).filter(
+      (instance) => !!instance && !!instance.isActive && !instance.isNonResponsive && !instance.isBlocked
+    );
+  }
   registerRemoteIntentDeputy(map) {
     if (!this.serviceName || map.serviceName === this.serviceName) {
       return;
@@ -3185,7 +3267,7 @@ var ServiceRegistry = class _ServiceRegistry {
 
 // src/graph/definition/SignalTransmissionTask.ts
 var import_core2 = require("@cadenza.io/core");
-var import_uuid2 = require("uuid");
+var import_uuid3 = require("uuid");
 var SignalTransmissionTask = class extends import_core2.Task {
   /**
    * Constructs a new instance of the class and initializes it with the provided parameters.
@@ -3214,7 +3296,7 @@ var SignalTransmissionTask = class extends import_core2.Task {
    */
   constructor(name, signalName, serviceName, description = "", concurrency = 0, timeout = 0, register = true, isUnique = false, isMeta = true, isSubMeta = false, isHidden = false, getTagCallback = void 0, inputSchema = void 0, validateInputContext = false, outputSchema = void 0, validateOutputContext = false, retryCount = 0, retryDelay = 0, retryDelayMax = 0, retryDelayFactor = 1) {
     const taskFunction = (context) => {
-      context.__routineExecId = (0, import_uuid2.v4)();
+      context.__routineExecId = (0, import_uuid3.v4)();
       return context;
     };
     super(
@@ -3284,7 +3366,7 @@ var import_node_http = __toESM(require("http"));
 var import_node_fs = __toESM(require("fs"));
 var import_node_https = __toESM(require("https"));
 var import_node_fetch = __toESM(require("node-fetch"));
-var import_uuid3 = require("uuid");
+var import_uuid4 = require("uuid");
 var RestController = class _RestController {
   /**
    * Constructor for initializing the REST server and related configurations.
@@ -3460,10 +3542,8 @@ var RestController = class _RestController {
                 }
               });
               app.post("/delegation", (req, res) => {
-                let deputyExecId;
-                let ctx2;
-                ctx2 = req.body;
-                deputyExecId = ctx2.__metadata.__deputyExecId;
+                const ctx2 = ensureDelegationContextMetadata(req.body);
+                const deputyExecId = ctx2.__metadata.__deputyExecId;
                 const remoteRoutineName = ctx2.__remoteRoutineName;
                 const targetNotFoundSignal = `meta.rest.delegation_target_not_found:${deputyExecId}`;
                 let resolved = false;
@@ -3646,7 +3726,7 @@ var RestController = class _RestController {
                   const internalOrigin = httpOrigin ?? httpsOrigin;
                   if (internalOrigin) {
                     transportData.unshift({
-                      uuid: (0, import_uuid3.v4)(),
+                      uuid: (0, import_uuid4.v4)(),
                       service_instance_id: ctx.__serviceInstanceId,
                       role: "internal",
                       origin: internalOrigin,
@@ -3812,6 +3892,8 @@ var RestController = class _RestController {
             if (ctx2.__remoteRoutineName === void 0) {
               return;
             }
+            const delegateCtx = ensureDelegationContextMetadata(ctx2);
+            const deputyExecId = delegateCtx.__metadata.__deputyExecId;
             fetchDiagnostics.delegationRequests++;
             fetchDiagnostics.updatedAt = Date.now();
             let resultContext;
@@ -3823,7 +3905,7 @@ var RestController = class _RestController {
                     "Content-Type": "application/json"
                   },
                   method: "POST",
-                  body: JSON.stringify(ctx2)
+                  body: JSON.stringify(delegateCtx)
                 },
                 3e4
               );
@@ -3845,14 +3927,11 @@ var RestController = class _RestController {
               resultContext = {
                 __error: `Error: ${e}`,
                 errored: true,
-                ...ctx2,
-                ...ctx2.__metadata
+                ...delegateCtx,
+                ...delegateCtx.__metadata
               };
             } finally {
-              emit(
-                `meta.fetch.delegated:${ctx2.__metadata.__deputyExecId}`,
-                resultContext
-              );
+              emit(`meta.fetch.delegated:${deputyExecId}`, resultContext);
             }
             return resultContext;
           },
@@ -4561,11 +4640,12 @@ var SocketController = class _SocketController {
                 CadenzaService.emit("meta.socket.handshake", ctx);
               });
               ws.on("delegation", (ctx, callback) => {
-                const deputyExecId = ctx.__metadata.__deputyExecId;
+                const delegationCtx = ensureDelegationContextMetadata(ctx);
+                const deputyExecId = delegationCtx.__metadata.__deputyExecId;
                 CadenzaService.createEphemeralMetaTask(
                   "Resolve delegation",
-                  (delegationCtx) => {
-                    callback(delegationCtx);
+                  (delegationCtx2) => {
+                    callback(delegationCtx2);
                   },
                   "Resolves a delegation request using client callback.",
                   { register: false }
@@ -4588,8 +4668,8 @@ var SocketController = class _SocketController {
                   `meta.node.graph_completed:${deputyExecId}`
                 ).emitsOnFail(`meta.socket.progress_failed:${deputyExecId}`);
                 CadenzaService.emit("meta.socket.delegation_requested", {
-                  ...ctx,
-                  __name: ctx.__remoteRoutineName
+                  ...delegationCtx,
+                  __name: delegationCtx.__remoteRoutineName
                 });
               });
               ws.on("signal", (ctx, callback) => {
@@ -5209,9 +5289,10 @@ var SocketController = class _SocketController {
               if (delegateCtx.__remoteRoutineName === void 0) {
                 return;
               }
-              delete delegateCtx.__isSubMeta;
-              delete delegateCtx.__broadcast;
-              const deputyExecId = delegateCtx.__metadata?.__deputyExecId;
+              const normalizedDelegateCtx = ensureDelegationContextMetadata(delegateCtx);
+              delete normalizedDelegateCtx.__isSubMeta;
+              delete normalizedDelegateCtx.__broadcast;
+              const deputyExecId = normalizedDelegateCtx.__metadata?.__deputyExecId;
               const requestSentAt = Date.now();
               if (deputyExecId) {
                 runtimeHandle.pendingDelegationIds.add(deputyExecId);
@@ -5220,8 +5301,8 @@ var SocketController = class _SocketController {
               try {
                 const resultContext = await runtimeHandle.emitWhenReady?.(
                   "delegation",
-                  delegateCtx,
-                  delegateCtx.__timeout ?? 6e4
+                  normalizedDelegateCtx,
+                  normalizedDelegateCtx.__timeout ?? 6e4
                 ) ?? {
                   errored: true,
                   __error: "Socket delegation returned no response"
@@ -8068,7 +8149,7 @@ function tableFieldTypeToSchemaType(type) {
 }
 
 // src/Cadenza.ts
-var import_uuid4 = require("uuid");
+var import_uuid5 = require("uuid");
 
 // src/graph/controllers/GraphSyncController.ts
 var ACTOR_TASK_METADATA = /* @__PURE__ */ Symbol.for("@cadenza.io/core/actor-task-meta");
@@ -9176,7 +9257,7 @@ var CadenzaService = class {
       (transport) => !!transport
     ).map((transport) => ({
       ...transport,
-      uuid: (0, import_uuid4.v4)()
+      uuid: (0, import_uuid5.v4)()
     }));
   }
   static createBootstrapTransport(serviceInstanceId, role, endpoint) {
@@ -9420,7 +9501,7 @@ var CadenzaService = class {
       }
       for (const responder of responders) {
         const { task, descriptor } = responder;
-        const inquiryId = (0, import_uuid4.v4)();
+        const inquiryId = (0, import_uuid5.v4)();
         startTimeByTask.set(task, Date.now());
         const resolverTask = this.createEphemeralMetaTask(
           `Resolve inquiry ${inquiry} for ${descriptor.localTaskName}`,
@@ -9911,7 +9992,7 @@ var CadenzaService = class {
     this.bootstrap();
     this.validateName(serviceName);
     this.validateServiceName(serviceName);
-    const serviceId = options.customServiceId ?? (0, import_uuid4.v4)();
+    const serviceId = options.customServiceId ?? (0, import_uuid5.v4)();
     this.serviceRegistry.serviceName = serviceName;
     this.serviceRegistry.serviceInstanceId = serviceId;
     this.setHydrationResults(options.hydration);
@@ -10739,7 +10820,7 @@ CadenzaService.frontendSyncScheduled = false;
 var import_core5 = require("@cadenza.io/core");
 
 // src/ssr/createSSRInquiryBridge.ts
-var import_uuid5 = require("uuid");
+var import_uuid6 = require("uuid");
 function ensureFetch() {
   if (typeof globalThis.fetch !== "function") {
     throw new Error("SSR inquiry bridge requires global fetch support.");
@@ -10828,7 +10909,7 @@ function createSSRInquiryBridge(options = {}) {
         __remoteRoutineName: remoteRoutineName,
         __metadata: {
           ...context.__metadata ?? {},
-          __deputyExecId: (0, import_uuid5.v4)()
+          __deputyExecId: (0, import_uuid6.v4)()
         }
       }),
       signal