@cadenza.io/service 1.9.55 → 1.10.1

package/dist/index.js

@@ -142,9 +142,11 @@ var DeputyTask = class extends import_core.Task {
       return new Promise((resolve, reject) => {
         if (context.__metadata.__blockRemoteExecution) {
           reject(new Error("Blocked remote execution"));
+          return;
         }
         if (context.__metadata.__skipRemoteExecution) {
           resolve(true);
+          return;
         }
         const processId = (0, import_uuid.v4)();
         context.__metadata.__deputyExecId = processId;
@@ -336,16 +338,16 @@ var ServiceRegistry = class _ServiceRegistry {
       "Handle Instance Update",
       (ctx, emit) => {
         var _a2;
-        const { serviceInstance } = ctx;
-        const { id, serviceName, address, port, exposed } = serviceInstance;
+        const { service_instance } = ctx;
+        const { id, serviceName, address, port, exposed } = service_instance;
         if (!this.instances.has(serviceName))
           this.instances.set(serviceName, []);
         const instances = this.instances.get(serviceName);
         const existing = instances.find((i) => i.id === id);
         if (existing) {
-          Object.assign(existing, serviceInstance);
+          Object.assign(existing, service_instance);
         } else {
-          if (this.deputies.has(serviceName) || this.remoteSignals.has(serviceName) || this.remoteSignals.has("*")) {
+          if (this.deputies.has(serviceName) || this.remoteSignals.has(serviceName) || this.remoteSignals.has("*") && this.serviceName !== serviceName) {
             const communicationTypes = Array.from(
               new Set(
                 (_a2 = this.deputies.get(serviceName).map((d) => d.communicationType)) != null ? _a2 : []
@@ -362,7 +364,7 @@ var ServiceRegistry = class _ServiceRegistry {
               protocol: exposed ? "https" : "http",
               communicationTypes
             });
-            serviceInstance.clientCreated = true;
+            service_instance.clientCreated = true;
             for (const instance of this.instances.get(serviceName)) {
               if (instance.clientCreated) continue;
               instance.clientCreated = true;
@@ -376,7 +378,7 @@ var ServiceRegistry = class _ServiceRegistry {
               });
             }
           }
-          instances.push(serviceInstance);
+          instances.push(service_instance);
         }
         return true;
       },
@@ -422,7 +424,10 @@ var ServiceRegistry = class _ServiceRegistry {
         }, ctx);
       },
       "Gets remote signals"
-    ).doOn("meta.fetch.handshake_complete");
+    ).doOn(
+      "meta.register_remote_signals_requested",
+      "meta.fetch.handshake_complete"
+    );
     this.handleSocketStatusUpdateTask = CadenzaService.createMetaTask(
       "Handle Socket Status Update",
       (ctx) => {
@@ -456,10 +461,7 @@ var ServiceRegistry = class _ServiceRegistry {
         "health",
         "exposed"
       ]
-    }).doOn(
-      "meta.service_registry_sync_requested",
-      "meta.service_registry.instance_inserted"
-    ).then(
+    }).doOn("meta.service_registry_sync_requested").then(
       CadenzaService.createMetaTask("Split service instances", function* (ctx) {
         const { serviceInstances } = ctx;
         if (!serviceInstances) return;
@@ -467,6 +469,7 @@ var ServiceRegistry = class _ServiceRegistry {
           yield { serviceInstance };
         }
       }).then(this.handleInstanceUpdateTask)
+      // .emits("meta.process_signal_queue_requested"), // TODO Has to happen after the endpoints has been created...
     );
     this.updateInstanceId = CadenzaService.createMetaTask(
       "Update instance id",
@@ -761,10 +764,7 @@ var ServiceRegistry = class _ServiceRegistry {
           return true;
         },
         "Sets service instance id after insertion"
-      ).emits(
-        "meta.service_registry.instance_inserted",
-        "meta.process_signal_queue_requested"
-      )
+      ).emits("meta.service_registry.instance_inserted")
     );
     CadenzaService.createMetaTask(
       "Handle service creation",
@@ -1344,53 +1344,58 @@ var SocketController = class _SocketController {
           if (!ctx.__useSocket) {
             return;
           }
-          const server = new import_socket.Server((_a2 = ctx.__httpsServer) != null ? _a2 : ctx.__httpServer);
-          ctx.__socketServer = server;
-          const profile = (_b2 = ctx.__securityProfile) != null ? _b2 : "medium";
-          server.use((socket, next) => {
-            var _a3;
-            const origin = socket.handshake.headers.origin;
-            const allowedOrigins = ["*"];
-            const networkType = (_a3 = ctx.__networkType) != null ? _a3 : "internal";
-            let effectiveOrigin = origin || "unknown";
-            if (networkType === "internal") effectiveOrigin = "internal";
-            if (profile !== "low" && !allowedOrigins.includes(effectiveOrigin) && !allowedOrigins.includes("*")) {
-              return next(new Error("Unauthorized origin"));
-            }
-            const limiterOptions = {
-              low: { points: Infinity, duration: 300 },
-              medium: { points: 100, duration: 300 },
-              high: { points: 50, duration: 60, blockDuration: 300 }
-            };
-            const limiter = new import_rate_limiter_flexible2.RateLimiterMemory(limiterOptions[profile]);
-            socket.use((packet, next2) => {
-              limiter.consume(socket.handshake.address).then(() => next2()).catch((rej) => {
-                if (rej.msBeforeNext > 0) {
-                  socket.emit("error", {
-                    message: "Rate limit exceeded",
-                    retryAfter: rej.msBeforeNext / 1e3
-                  });
-                } else {
-                  socket.disconnect(true);
-                }
+          console.log("SocketServer: Setting up", ctx);
+          try {
+            const server = new import_socket.Server((_a2 = ctx.__httpsServer) != null ? _a2 : ctx.__httpServer);
+            ctx.__socketServer = server;
+            const profile = (_b2 = ctx.__securityProfile) != null ? _b2 : "medium";
+            server.use((socket, next) => {
+              var _a3;
+              const origin = socket.handshake.headers.origin;
+              const allowedOrigins = ["*"];
+              const networkType = (_a3 = ctx.__networkType) != null ? _a3 : "internal";
+              let effectiveOrigin = origin || "unknown";
+              if (networkType === "internal") effectiveOrigin = "internal";
+              if (profile !== "low" && !allowedOrigins.includes(effectiveOrigin) && !allowedOrigins.includes("*")) {
+                return next(new Error("Unauthorized origin"));
+              }
+              const limiterOptions = {
+                low: { points: Infinity, duration: 300 },
+                medium: { points: 100, duration: 300 },
+                high: { points: 50, duration: 60, blockDuration: 300 }
+              };
+              const limiter = new import_rate_limiter_flexible2.RateLimiterMemory(limiterOptions[profile]);
+              socket.use((packet, next2) => {
+                limiter.consume(socket.handshake.address).then(() => next2()).catch((rej) => {
+                  if (rej.msBeforeNext > 0) {
+                    socket.emit("error", {
+                      message: "Rate limit exceeded",
+                      retryAfter: rej.msBeforeNext / 1e3
+                    });
+                  } else {
+                    socket.disconnect(true);
+                  }
+                });
               });
-            });
-            socket.use((packet, next2) => {
-              if (profile !== "low") {
-                const sanitize = (data) => {
-                  if (typeof data === "string") return (0, import_xss.default)(data);
-                  if (typeof data === "object") {
-                    for (const key in data) {
-                      data[key] = sanitize(data[key]);
+              socket.use((packet, next2) => {
+                if (profile !== "low") {
+                  const sanitize = (data) => {
+                    if (typeof data === "string") return (0, import_xss.default)(data);
+                    if (typeof data === "object") {
+                      for (const key in data) {
+                        data[key] = sanitize(data[key]);
+                      }
                     }
-                  }
-                  return data;
-                };
-                packet[1] = sanitize(packet[1]);
-              }
-              next2();
+                    return data;
+                  };
+                  packet[1] = sanitize(packet[1]);
+                }
+                next2();
+              });
             });
-          });
+          } catch (err) {
+            console.error("Socket setup error:", err);
+          }
         }).then(
           CadenzaService.createMetaTask(
             "Start SocketServer",
@@ -1548,6 +1553,7 @@ var SocketController = class _SocketController {
             if (ctx2.__remoteRoutineName === void 0) {
               return;
             }
+            console.log("Socket Delegate:", ctx2);
             let resultContext;
             try {
               resultContext = yield socket.timeout((_a2 = ctx2.__timeout) != null ? _a2 : 0).emitWithAck("delegation", ctx2);
@@ -1558,6 +1564,7 @@ var SocketController = class _SocketController {
                 __spreadValues(__spreadValues({}, resultContext), metadata)
               );
             } catch (e) {
+              console.log("socket error:", e);
               resultContext = __spreadValues(__spreadValues({
                 __error: `Timeout error: ${e}`,
                 errored: true
@@ -1647,6 +1654,9 @@ var SignalController = class _SignalController {
           const firstChar = __signalName.charAt(0);
           if (firstChar === firstChar.toUpperCase() && firstChar !== firstChar.toLowerCase() || firstChar === "*") {
             const serviceName = __signalName.split(".")[0];
+            if (CadenzaService.serviceRegistry.serviceName === serviceName) {
+              return false;
+            }
             ctx.__listenerServiceName = CadenzaService.serviceRegistry.serviceName;
             ctx.__emitterSignalName = __signalName.split(".").slice(1).join(".");
             ctx.__signalName = "meta.signal_controller.foreign_signal_registered";
@@ -3628,8 +3638,8 @@ var CadenzaService = class {
     if ((_g = options.cadenzaDB) == null ? void 0 : _g.connect) {
       import_core3.default.broker.emit("meta.initializing_service", {
         // Seed the CadenzaDB
-        serviceInstance: {
-          id: "cadenza-db",
+        service_instance: {
+          uuid: "cadenza-db",
           serviceName: "CadenzaDB",
           address: (_h = options.cadenzaDB) == null ? void 0 : _h.address,
           port: (_i = options.cadenzaDB) == null ? void 0 : _i.port,
@@ -3646,8 +3656,8 @@ var CadenzaService = class {
     (_j = options.relatedServices) == null ? void 0 : _j.forEach((service) => {
       var _a3;
       import_core3.default.broker.emit("meta.initializing_service", {
-        serviceInstance: {
-          id: service[0],
+        service_instance: {
+          uuid: service[0],
           serviceName: service[1],
           address: service[2].split(":")[0],
           port: (_a3 = service[2].split(":")[1]) != null ? _a3 : 3e3,
@@ -3691,6 +3701,8 @@ var CadenzaService = class {
       (ctx, emit) => {
         SignalController.instance;
         GraphMetadataController.instance;
+        emit("meta.service_registry_sync_requested", {});
+        emit("meta.register_remote_signals_requested", { serviceName });
         emit("meta.register_all_routines", {});
         emit("meta.register_all_tasks", {});
         emit("meta.register_all_signals", {});