@cadenza.io/service 2.17.14 → 2.17.15

package/dist/browser/index.js

@@ -1183,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;
@@ -1422,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,
@@ -2263,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,
@@ -2273,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,
@@ -2286,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;