@cadenza.io/service 2.17.6 → 2.17.8

package/dist/index.mjs

@@ -1243,9 +1243,23 @@ var ServiceRegistry = class _ServiceRegistry {
       (ctx, emit) => {
         const { serviceName, serviceInstanceId } = ctx;
         const serviceInstances = this.instances.get(serviceName);
-        const instance = serviceInstances?.find(
+        let instance = serviceInstances?.find(
           (i) => i.uuid === serviceInstanceId
         );
+        if (!instance && serviceName && serviceInstanceId) {
+          const bootstrapPlaceholder = serviceInstances?.find(
+            (candidate) => candidate.isBootstrapPlaceholder && (!ctx.serviceTransportId || candidate.transports.some(
+              (transport) => transport.uuid === ctx.serviceTransportId
+            ))
+          );
+          if (bootstrapPlaceholder) {
+            instance = this.adoptBootstrapPlaceholderInstanceId(
+              serviceName,
+              bootstrapPlaceholder.uuid,
+              serviceInstanceId
+            );
+          }
+        }
         if (!instance) {
           return false;
         }
@@ -2517,6 +2531,72 @@ var ServiceRegistry = class _ServiceRegistry {
       instances.filter((instance) => !instance.isBootstrapPlaceholder)
     );
   }
+  adoptBootstrapPlaceholderInstanceId(serviceName, placeholderInstanceId, resolvedInstanceId) {
+    if (!serviceName || !placeholderInstanceId || !resolvedInstanceId) {
+      return void 0;
+    }
+    const instances = this.instances.get(serviceName);
+    if (!instances?.length) {
+      return void 0;
+    }
+    const resolvedInstance = instances.find(
+      (instance) => instance.uuid === resolvedInstanceId
+    );
+    if (resolvedInstance) {
+      return resolvedInstance;
+    }
+    const placeholder = instances.find(
+      (instance) => instance.uuid === placeholderInstanceId && instance.isBootstrapPlaceholder
+    );
+    if (!placeholder) {
+      return void 0;
+    }
+    const wasDependee = this.dependeeByInstance.has(placeholderInstanceId);
+    const dependeeServiceName = this.dependeeByInstance.get(placeholderInstanceId) ?? serviceName;
+    const requiredForReadiness = this.readinessDependeeByInstance.has(
+      placeholderInstanceId
+    );
+    const lastHeartbeatAt = this.lastHeartbeatAtByInstance.get(placeholderInstanceId) ?? Date.now();
+    const missedHeartbeats = this.missedHeartbeatsByInstance.get(placeholderInstanceId) ?? 0;
+    const inFlight = this.runtimeStatusFallbackInFlightByInstance.has(
+      placeholderInstanceId
+    );
+    this.dependeeByInstance.delete(placeholderInstanceId);
+    this.readinessDependeeByInstance.delete(placeholderInstanceId);
+    this.lastHeartbeatAtByInstance.delete(placeholderInstanceId);
+    this.missedHeartbeatsByInstance.delete(placeholderInstanceId);
+    this.runtimeStatusFallbackInFlightByInstance.delete(placeholderInstanceId);
+    placeholder.uuid = resolvedInstanceId;
+    placeholder.isBootstrapPlaceholder = false;
+    placeholder.transports = placeholder.transports.map((transport) => ({
+      ...transport,
+      serviceInstanceId: resolvedInstanceId
+    }));
+    if (wasDependee) {
+      this.dependeeByInstance.set(resolvedInstanceId, dependeeServiceName);
+      if (this.dependeesByService.has(dependeeServiceName)) {
+        this.dependeesByService.get(dependeeServiceName).delete(
+          placeholderInstanceId
+        );
+        this.dependeesByService.get(dependeeServiceName).add(resolvedInstanceId);
+      }
+      this.lastHeartbeatAtByInstance.set(resolvedInstanceId, lastHeartbeatAt);
+      this.missedHeartbeatsByInstance.set(resolvedInstanceId, missedHeartbeats);
+    }
+    if (requiredForReadiness) {
+      this.readinessDependeeByInstance.set(resolvedInstanceId, serviceName);
+      if (this.readinessDependeesByService.has(serviceName)) {
+        this.readinessDependeesByService.get(serviceName).delete(
+          placeholderInstanceId
+        );
+        this.readinessDependeesByService.get(serviceName).add(resolvedInstanceId);
+      }
+    }
+    if (inFlight) {
+      this.runtimeStatusFallbackInFlightByInstance.add(resolvedInstanceId);
+    }
+    return placeholder;
+  }
   getHeartbeatMisses(serviceInstanceId, now = Date.now()) {
     const observedMisses = this.missedHeartbeatsByInstance.get(serviceInstanceId) ?? 0;
     const lastHeartbeatAt = this.lastHeartbeatAtByInstance.get(serviceInstanceId) ?? 0;
@@ -8631,6 +8711,15 @@ function readConfiguredPort(value) {
 function buildBootstrapUrl(protocol, address, port) {
   return `${protocol}://${address}:${port}`;
 }
+function readExplicitPortFromOrigin(raw) {
+  const match = raw.match(
+    /^[a-z]+:\/\/(?:\[[^\]]+\]|[^\/?#:]+):(\d+)(?:\/)?$/i
+  );
+  if (!match?.[1]) {
+    return void 0;
+  }
+  return readConfiguredPort(match[1]);
+}
 function resolveInjectedBootstrapUrl(injectedGlobalKey) {
   if (typeof globalThis === "undefined") {
     return void 0;
@@ -8720,7 +8809,8 @@ function resolveBootstrapEndpoint(options) {
         "Bootstrap URL must be an origin without a path component."
       );
     }
-    const port2 = parsed2.port ? readConfiguredPort(parsed2.port) : fallbackPort;
+    const explicitPort = readExplicitPortFromOrigin(raw);
+    const port2 = explicitPort ?? (parsed2.port ? readConfiguredPort(parsed2.port) : fallbackPort);
     if (!port2) {
       throw new Error(
         "Bootstrap URL must include a port or CADENZA_DB_PORT must be provided."