@cadenza.io/service 2.2.4 → 2.3.1

package/dist/index.mjs

@@ -270,8 +270,29 @@ var ServiceRegistry = class _ServiceRegistry {
       "Handle Instance Update",
       (ctx, emit) => {
         const { serviceInstance } = ctx;
-        const { uuid: uuid4, serviceName, address, port, exposed, isFrontend } = serviceInstance;
+        const {
+          uuid: uuid4,
+          serviceName,
+          address,
+          port,
+          exposed,
+          isFrontend,
+          deleted
+        } = serviceInstance;
         if (uuid4 === this.serviceInstanceId) return;
+        if (deleted) {
+          this.instances.get(serviceName)?.splice(
+            this.instances.get(serviceName)?.findIndex((i) => i.uuid === uuid4) ?? -1,
+            1
+          );
+          if (this.instances.get(serviceName)?.length === 0) {
+            this.instances.delete(serviceName);
+          } else if (this.instances.get(serviceName)?.filter((i) => i.address === address && i.port === port).length === 0) {
+            emit(`meta.socket_shutdown_requested:${address}_${port}`, {});
+            emit(`meta.fetch.destroy_requested:${address}_${port}`, {});
+          }
+          return;
+        }
         if (!this.instances.has(serviceName))
           this.instances.set(serviceName, []);
         const instances = this.instances.get(serviceName);
@@ -322,7 +343,11 @@ var ServiceRegistry = class _ServiceRegistry {
       "meta.service_instance.inserted",
       "meta.service_instance.updated",
       "meta.socket_client.status_received"
-    ).attachSignal("meta.service_registry.dependee_registered");
+    ).attachSignal(
+      "meta.service_registry.dependee_registered",
+      "meta.socket_shutdown_requested",
+      "meta.fetch.destroy_requested"
+    );
     CadenzaService.createMetaTask("Split service instances", function* (ctx) {
       if (!ctx.serviceInstances) {
         return;
@@ -410,7 +435,7 @@ var ServiceRegistry = class _ServiceRegistry {
     this.handleServiceHandshakeTask = CadenzaService.createMetaTask(
       "Handle service handshake",
       (ctx, emit) => {
-        const { serviceName, serviceInstanceId } = ctx;
+        const { serviceName, serviceInstanceId, serviceAddress, servicePort } = ctx;
         const serviceInstances = this.instances.get(serviceName);
         const instance = serviceInstances?.find(
           (i) => i.uuid === serviceInstanceId
@@ -429,10 +454,29 @@ var ServiceRegistry = class _ServiceRegistry {
             uuid: instance.uuid
           }
         });
+        const instancesToDelete = serviceInstances?.filter(
+          (i) => i.uuid !== serviceInstanceId && i.address === serviceAddress && i.port === servicePort
+        );
+        for (const i of instancesToDelete ?? []) {
+          this.instances.get(serviceName)?.splice(this.instances.get(serviceName)?.indexOf(i) ?? -1, 1);
+          emit("global.meta.service_registry.deleted", {
+            data: {
+              isActive: false,
+              isNonResponsive: false,
+              deleted: true
+            },
+            filter: {
+              uuid: i.uuid
+            }
+          });
+        }
         return true;
       },
       "Handles service handshake"
-    ).doOn("meta.fetch.handshake_complete").attachSignal("global.meta.service_registry.service_handshake");
+    ).doOn("meta.fetch.handshake_complete").attachSignal(
+      "global.meta.service_registry.service_handshake",
+      "global.meta.service_registry.deleted"
+    );
     this.handleSocketStatusUpdateTask = CadenzaService.createMetaTask(
       "Handle Socket Status Update",
       (ctx) => {
@@ -1208,7 +1252,7 @@ var RestController = class _RestController {
             CadenzaService.createMetaTask(
               "Configure network",
               async (ctx) => {
-                let address = "localhost";
+                let address = "undefined";
                 let port = ctx.__port;
                 let exposed = false;
                 const createHttpServer = async (ctx2) => {
@@ -1225,7 +1269,7 @@ var RestController = class _RestController {
                           address = process.env.CADENZA_SERVER_URL || "localhost";
                         }
                       } else {
-                        address = server?.address()?.address || "";
+                        address = server?.address()?.address || "undefined";
                       }
                       console.log(
                         `Server is running on ${address}:${port}`
@@ -1512,7 +1556,7 @@ var RestController = class _RestController {
           transmitTask.destroy();
           statusTask.destroy();
         }).doOn(
-          "meta.fetch.destroy_requested",
+          `meta.fetch.destroy_requested:${fetchId}`,
           `meta.socket_client.disconnected:${fetchId}`,
           `meta.fetch.handshake_failed:${fetchId}`
         ).emits("meta.fetch.destroyed");