@cadenza.io/service 2.17.2 → 2.17.4

package/dist/index.mjs

@@ -409,7 +409,14 @@ function selectTransportForRole(transports, role, protocol) {
   const filtered = transports.filter(
     (transport) => !transport.deleted && transport.role === role && (!protocol || transportSupportsProtocol(transport, protocol))
   );
-  return filtered[0];
+  return filtered.sort((left, right) => {
+    const leftIsBootstrap = left.uuid.endsWith("-bootstrap") ? 1 : 0;
+    const rightIsBootstrap = right.uuid.endsWith("-bootstrap") ? 1 : 0;
+    if (leftIsBootstrap !== rightIsBootstrap) {
+      return leftIsBootstrap - rightIsBootstrap;
+    }
+    return left.origin.localeCompare(right.origin);
+  })[0];
 }
 function buildTransportClientKey(transport) {
   return transport.uuid;
@@ -1427,20 +1434,25 @@ var ServiceRegistry = class _ServiceRegistry {
     this.getBalancedInstance = CadenzaService.createMetaTask(
       "Get balanced instance",
       (context, emit) => {
-        const { __serviceName, __triedInstances, __retries, __broadcast } = context;
+        const {
+          __serviceName,
+          __triedInstances,
+          __retries,
+          __broadcast,
+          targetServiceInstanceId
+        } = context;
         let retries = __retries ?? 0;
         let triedInstances = __triedInstances ?? [];
         const preferredRole = this.getRoutingTransportRole();
         const instances = this.instances.get(__serviceName)?.filter((instance) => {
+          if (targetServiceInstanceId && instance.uuid !== targetServiceInstanceId) {
+            return false;
+          }
           if (!instance.isActive || instance.isNonResponsive || instance.isBlocked) {
             return false;
           }
           return Boolean(
-            this.getRouteableTransport(
-              instance,
-              this.useSocket ? "socket" : "rest",
-              preferredRole
-            ) ?? this.getRouteableTransport(instance, "rest", preferredRole)
+            this.selectTransportForInstance(instance, context, preferredRole)
           );
         }).sort((a, b) => {
           const leftStatus = this.resolveRuntimeStatusSnapshot(
@@ -1472,13 +1484,17 @@ var ServiceRegistry = class _ServiceRegistry {
         }
         if (__broadcast || instances[0].isFrontend) {
           for (const instance of instances) {
-            const selectedTransport2 = this.getRouteableTransport(instance, "socket", preferredRole) ?? this.getRouteableTransport(instance, "rest", preferredRole);
+            const selectedTransport2 = this.selectTransportForInstance(
+              instance,
+              context,
+              preferredRole
+            );
             if (!selectedTransport2) {
               continue;
             }
             const transportKey = buildTransportClientKey(selectedTransport2);
             emit(
-              `${this.useSocket && transportSupportsProtocol(selectedTransport2, "socket") ? "meta.service_registry.selected_instance_for_socket" : "meta.service_registry.selected_instance_for_fetch"}:${transportKey}`,
+              `${this.resolveTransportProtocolOrder(context)[0] === "socket" && transportSupportsProtocol(selectedTransport2, "socket") ? "meta.service_registry.selected_instance_for_socket" : "meta.service_registry.selected_instance_for_fetch"}:${transportKey}`,
               {
                 ...context,
                 __instance: instance.uuid,
@@ -1509,7 +1525,11 @@ var ServiceRegistry = class _ServiceRegistry {
         if (retries > 0) {
           selected = instancesToTry[Math.floor(Math.random() * instancesToTry.length)];
         }
-        const selectedTransport = this.getRouteableTransport(selected, "socket", preferredRole) ?? this.getRouteableTransport(selected, "rest", preferredRole);
+        const selectedTransport = this.selectTransportForInstance(
+          selected,
+          context,
+          preferredRole
+        );
         if (!selectedTransport) {
           context.errored = true;
           context.__error = `No routeable ${preferredRole} transport available for ${selected.serviceName}/${selected.uuid}.`;
@@ -1527,7 +1547,7 @@ var ServiceRegistry = class _ServiceRegistry {
         context.__triedInstances = triedInstances;
         context.__triedInstances.push(selected.uuid);
         context.__retries = retries;
-        if (this.useSocket && transportSupportsProtocol(selectedTransport, "socket")) {
+        if (this.resolveTransportProtocolOrder(context)[0] === "socket" && transportSupportsProtocol(selectedTransport, "socket")) {
           emit(
             `meta.service_registry.selected_instance_for_socket:${context.__fetchId}`,
             context
@@ -1553,50 +1573,10 @@ var ServiceRegistry = class _ServiceRegistry {
       "meta.service_registry.selected_instance_for_fetch",
       "meta.service_registry.socket_failed"
     );
-    this.getStatusTask = CadenzaService.createMetaTask("Get status", (ctx) => {
-      if (!this.serviceName) {
-        return {
-          __status: "error",
-          __error: "No service name defined",
-          errored: true
-        };
-      }
-      if (!this.serviceInstanceId) {
-        return {
-          __status: "error",
-          __error: "No service instance id defined",
-          errored: true
-        };
-      }
-      const report = this.buildLocalRuntimeStatusReport("full");
-      if (!report) {
-        return {
-          ...ctx,
-          __status: "error",
-          __error: "No local service instance available for status check",
-          errored: true
-        };
-      }
-      return {
-        ...ctx,
-        __status: "ok",
-        __serviceName: report.serviceName,
-        __serviceInstanceId: report.serviceInstanceId,
-        __numberOfRunningGraphs: report.numberOfRunningGraphs,
-        __health: report.health ?? {},
-        __active: report.isActive,
-        reportedAt: report.reportedAt,
-        serviceName: report.serviceName,
-        serviceInstanceId: report.serviceInstanceId,
-        numberOfRunningGraphs: report.numberOfRunningGraphs,
-        health: report.health ?? {},
-        isActive: report.isActive,
-        isNonResponsive: report.isNonResponsive,
-        isBlocked: report.isBlocked,
-        state: report.state,
-        acceptingWork: report.acceptingWork
-      };
-    }).doOn(
+    this.getStatusTask = CadenzaService.createMetaTask(
+      "Get status",
+      (ctx) => this.resolveLocalStatusCheck(ctx)
+    ).doOn(
       "meta.socket.status_check_requested",
       "meta.rest.status_check_requested"
     );
@@ -2308,6 +2288,65 @@ var ServiceRegistry = class _ServiceRegistry {
     }
     return this.getInstance(this.serviceName, this.serviceInstanceId);
   }
+  resolveLocalStatusCheck(ctx = {}) {
+    if (!this.serviceName) {
+      return {
+        __status: "error",
+        __error: "No service name defined",
+        errored: true
+      };
+    }
+    if (!this.serviceInstanceId) {
+      return {
+        __status: "error",
+        __error: "No service instance id defined",
+        errored: true
+      };
+    }
+    const report = this.buildLocalRuntimeStatusReport("full");
+    if (!report) {
+      return {
+        ...ctx,
+        __status: "error",
+        __error: "No local service instance available for status check",
+        errored: true
+      };
+    }
+    return {
+      ...ctx,
+      __status: "ok",
+      __serviceName: report.serviceName,
+      __serviceInstanceId: report.serviceInstanceId,
+      __numberOfRunningGraphs: report.numberOfRunningGraphs,
+      __health: report.health ?? {},
+      __active: report.isActive,
+      reportedAt: report.reportedAt,
+      serviceName: report.serviceName,
+      serviceInstanceId: report.serviceInstanceId,
+      numberOfRunningGraphs: report.numberOfRunningGraphs,
+      health: report.health ?? {},
+      isActive: report.isActive,
+      isNonResponsive: report.isNonResponsive,
+      isBlocked: report.isBlocked,
+      state: report.state,
+      acceptingWork: report.acceptingWork
+    };
+  }
+  resolveTransportProtocolOrder(ctx) {
+    const explicit = ctx.__preferredTransportProtocol === "rest" || ctx.__preferredTransportProtocol === "socket" ? ctx.__preferredTransportProtocol : void 0;
+    const preferred = explicit ?? (this.useSocket ? "socket" : "rest");
+    const fallback = preferred === "socket" ? "rest" : "socket";
+    return [preferred, fallback];
+  }
+  selectTransportForInstance(instance, ctx, role = this.getRoutingTransportRole()) {
+    for (const protocol of this.resolveTransportProtocolOrder(ctx)) {
+      const transport = this.getRouteableTransport(instance, protocol, role);
+      if (transport) {
+        return transport;
+      }
+    }
+    return void 0;
+  }
   getRoutingTransportRole() {
     return this.isFrontend ? "public" : "internal";
   }
@@ -2567,12 +2606,41 @@ var ServiceRegistry = class _ServiceRegistry {
     return null;
   }
   async resolveRuntimeStatusFallbackInquiry(serviceName, serviceInstanceId, options = {}) {
+    const instance = this.getInstance(serviceName, serviceInstanceId);
+    if (instance) {
+      const directReport = await this.requestRuntimeStatusViaRest(
+        instance,
+        serviceName,
+        serviceInstanceId
+      );
+      if (directReport) {
+        if (!this.applyRuntimeStatusReport(directReport)) {
+          throw new Error(
+            `No tracked instance for runtime fallback ${serviceName}/${serviceInstanceId}`
+          );
+        }
+        this.lastHeartbeatAtByInstance.set(serviceInstanceId, Date.now());
+        this.missedHeartbeatsByInstance.set(serviceInstanceId, 0);
+        return {
+          report: directReport,
+          inquiryMeta: {
+            inquiry: META_RUNTIME_STATUS_INTENT,
+            responded: 1,
+            failed: 0,
+            timedOut: 0,
+            pending: 0,
+            directStatusCheck: true
+          }
+        };
+      }
+    }
     const inquiryResult = await CadenzaService.inquire(
       META_RUNTIME_STATUS_INTENT,
       {
         targetServiceName: serviceName,
         targetServiceInstanceId: serviceInstanceId,
-        detailLevel: options.detailLevel ?? "minimal"
+        detailLevel: options.detailLevel ?? "minimal",
+        __preferredTransportProtocol: "rest"
       },
       {
         overallTimeoutMs: options.overallTimeoutMs ?? this.runtimeStatusFallbackTimeoutMs,
@@ -2602,6 +2670,46 @@ var ServiceRegistry = class _ServiceRegistry {
       inquiryMeta: inquiryResult.__inquiryMeta ?? {}
     };
   }
+  async requestRuntimeStatusViaRest(instance, serviceName, serviceInstanceId) {
+    if (typeof globalThis.fetch !== "function") {
+      return null;
+    }
+    const transport = this.getRouteableTransport(instance, "rest");
+    if (!transport) {
+      return null;
+    }
+    const controller = typeof AbortController === "function" ? new AbortController() : null;
+    const timeoutId = controller ? setTimeout(() => controller.abort(), this.runtimeStatusFallbackTimeoutMs) : null;
+    try {
+      const response = await globalThis.fetch(`${transport.origin}/status`, {
+        method: "GET",
+        signal: controller?.signal
+      });
+      if ("ok" in response && response.ok === false) {
+        return null;
+      }
+      const payload = typeof response.json === "function" ? await response.json() : response;
+      const report = this.normalizeRuntimeStatusReport({
+        ...payload,
+        serviceTransportId: payload?.serviceTransportId ?? transport.uuid,
+        serviceOrigin: payload?.serviceOrigin ?? transport.origin,
+        transportProtocols: payload?.transportProtocols ?? transport.protocols
+      });
+      if (!report) {
+        return null;
+      }
+      if (report.serviceName !== serviceName || report.serviceInstanceId !== serviceInstanceId) {
+        return null;
+      }
+      return report;
+    } catch {
+      return null;
+    } finally {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    }
+  }
   evaluateDependencyReadinessDetail(serviceName, serviceInstanceId, now = Date.now()) {
     const instance = this.getInstance(serviceName, serviceInstanceId);
     const missedHeartbeats = this.getHeartbeatMisses(serviceInstanceId, now);
@@ -3103,15 +3211,11 @@ var RestController = class _RestController {
                 CadenzaService.emit(ctx2.__signalName, ctx2);
               });
               app.get("/status", (req, res) => {
-                CadenzaService.createEphemeralMetaTask(
-                  "Resolve status check",
-                  (statusCtx) => res.json(statusCtx),
-                  "Resolves a status check request",
-                  { register: false }
-                ).doAfter(CadenzaService.serviceRegistry.getStatusTask);
-                CadenzaService.emit(
-                  "meta.rest.status_check_requested",
-                  req.body.query
+                const statusCheckQuery = req?.body?.query && typeof req.body.query === "object" ? req.body.query : req?.query && typeof req.query === "object" ? { ...req.query } : {};
+                res.json(
+                  CadenzaService.serviceRegistry.resolveLocalStatusCheck(
+                    statusCheckQuery
+                  )
                 );
               });
               return true;
@@ -4183,13 +4287,7 @@ var SocketController = class _SocketController {
               ws.on(
                 "status_check",
                 (ctx, callback) => {
-                  CadenzaService.createEphemeralMetaTask(
-                    "Resolve status check",
-                    callback,
-                    "Resolves a status check request",
-                    { register: false }
-                  ).doAfter(CadenzaService.serviceRegistry.getStatusTask);
-                  CadenzaService.emit("meta.socket.status_check_requested", ctx);
+                  callback(CadenzaService.serviceRegistry.resolveLocalStatusCheck(ctx));
                 }
               );
               ws.on("disconnect", () => {