@cadenza.io/service 1.10.5 → 1.10.7

package/dist/index.d.mts

@@ -130,7 +130,7 @@ declare class DatabaseTask extends DeputyTask {
 }
 
 interface ServiceInstanceDescriptor {
-    id: string;
+    uuid: string;
     address: string;
     port: number;
     serviceName: string;

package/dist/index.d.ts

@@ -130,7 +130,7 @@ declare class DatabaseTask extends DeputyTask {
 }
 
 interface ServiceInstanceDescriptor {
-    id: string;
+    uuid: string;
     address: string;
     port: number;
     serviceName: string;

package/dist/index.js

@@ -339,11 +339,11 @@ var ServiceRegistry = class _ServiceRegistry {
       (ctx, emit) => {
         var _a2;
         const { service_instance } = ctx;
-        const { id, serviceName, address, port, exposed } = service_instance;
+        const { uuid: uuid4, 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);
+        const existing = instances.find((i) => i.uuid === uuid4);
         if (existing) {
           Object.assign(existing, service_instance);
         } else {
@@ -358,7 +358,7 @@ var ServiceRegistry = class _ServiceRegistry {
             }
             emit("meta.service_registry.dependee_registered", {
               serviceName,
-              serviceInstanceId: id,
+              serviceInstanceId: uuid4,
               serviceAddress: address,
               servicePort: port,
               protocol: exposed ? "https" : "http",
@@ -370,7 +370,7 @@ var ServiceRegistry = class _ServiceRegistry {
               instance.clientCreated = true;
               emit("meta.service_registry.dependee_registered", {
                 serviceName,
-                serviceInstanceId: id,
+                serviceInstanceId: uuid4,
                 serviceAddress: address,
                 servicePort: port,
                 protocol: exposed ? "https" : "http",
@@ -434,7 +434,7 @@ var ServiceRegistry = class _ServiceRegistry {
         const instanceId = ctx.__serviceInstanceId;
         const serviceName = ctx.__serviceName;
         const instances = this.instances.get(serviceName);
-        const instance = instances == null ? void 0 : instances.find((i) => i.id === instanceId);
+        const instance = instances == null ? void 0 : instances.find((i) => i.uuid === instanceId);
         if (instance) {
           instance.health = ctx.health;
           instance.numberOfRunningGraphs = ctx.numberOfRunningGraphs;
@@ -489,7 +489,7 @@ var ServiceRegistry = class _ServiceRegistry {
         const { __id } = context;
         let instance;
         for (const instances of this.instances.values()) {
-          instance = instances.find((i) => i.id === __id);
+          instance = instances.find((i) => i.uuid === __id);
           if (instance) break;
         }
         return __spreadProps(__spreadValues({}, context), { __instance: instance });
@@ -567,7 +567,7 @@ var ServiceRegistry = class _ServiceRegistry {
           return context;
         }
         let instancesToTry = instances.filter(
-          (i) => !(__triedInstances == null ? void 0 : __triedInstances.includes(i.id))
+          (i) => !(__triedInstances == null ? void 0 : __triedInstances.includes(i.uuid))
         );
         if (instancesToTry.length === 0) {
           if (this.useSocket) {
@@ -584,9 +584,9 @@ var ServiceRegistry = class _ServiceRegistry {
         if (retries > 0) {
           selected = instancesToTry[Math.floor(Math.random() * instancesToTry.length)];
         }
-        context.__instance = selected.id;
+        context.__instance = selected.uuid;
         context.__triedInstances = triedInstances;
-        context.__triedInstances.push(selected.id);
+        context.__triedInstances.push(selected.uuid);
         context.__retries = retries;
         if (this.useSocket) {
           emit(
@@ -625,7 +625,7 @@ var ServiceRegistry = class _ServiceRegistry {
           errored: true
         };
       }
-      const self2 = (_a2 = this.instances.get(this.serviceName)) == null ? void 0 : _a2.find((i) => i.id === this.serviceInstanceId);
+      const self2 = (_a2 = this.instances.get(this.serviceName)) == null ? void 0 : _a2.find((i) => i.uuid === this.serviceInstanceId);
       return __spreadProps(__spreadValues({}, ctx), {
         __status: "ok",
         __numberOfRunningGraphs: (_b2 = self2 == null ? void 0 : self2.numberOfRunningGraphs) != null ? _b2 : 0,
@@ -1345,13 +1345,19 @@ var SocketController = class _SocketController {
             return;
           }
           console.log("SocketServer: Setting up", ctx);
+          let server;
           try {
-            const server = new import_socket.Server((_a2 = ctx.__httpsServer) != null ? _a2 : ctx.__httpServer);
-            ctx.__socketServer = server;
+            server = new import_socket.Server((_a2 = ctx.__httpsServer) != null ? _a2 : ctx.__httpServer);
             console.log("SocketServer:", server);
             const profile = (_b2 = ctx.__securityProfile) != null ? _b2 : "medium";
             server.use((socket, next) => {
               var _a3;
+              console.log(
+                "SocketServer: middleware",
+                socket.handshake.headers.origin,
+                profile,
+                ctx.__networkType
+              );
               const origin = socket.handshake.headers.origin;
               const allowedOrigins = ["*"];
               const networkType = (_a3 = ctx.__networkType) != null ? _a3 : "internal";
@@ -1369,11 +1375,16 @@ var SocketController = class _SocketController {
               socket.use((packet, next2) => {
                 limiter.consume(socket.handshake.address).then(() => next2()).catch((rej) => {
                   if (rej.msBeforeNext > 0) {
+                    console.log(
+                      "SocketServer: Rate limit exceeded",
+                      rej.msBeforeNext / 1e3
+                    );
                     socket.emit("error", {
                       message: "Rate limit exceeded",
                       retryAfter: rej.msBeforeNext / 1e3
                     });
                   } else {
+                    console.log("SocketServer: Rate limit exceeded, blocked");
                     socket.disconnect(true);
                   }
                 });
@@ -1389,7 +1400,9 @@ var SocketController = class _SocketController {
                     }
                     return data;
                   };
+                  console.log("SocketServer: Sanitizing", packet[1]);
                   packet[1] = sanitize(packet[1]);
+                  console.log("SocketServer: Sanitized", packet[1]);
                 }
                 next2();
               });
@@ -1397,114 +1410,101 @@ var SocketController = class _SocketController {
             console.log("SocketServer: Setup complete");
           } catch (err) {
             console.error("Socket setup error:", err);
-            return false;
+            return __spreadProps(__spreadValues({}, ctx), { __error: err, errored: true });
           }
-          return ctx;
-        }).then(
-          CadenzaService.createMetaTask(
-            "Start SocketServer",
-            (ctx) => {
-              const server = ctx.__socketServer;
-              console.log("SocketServer: Starting", server);
-              server.on("connection", (ws) => {
-                console.log("SocketServer: New connection");
-                ws.on("handshake", (ctx2) => {
-                  console.log("Socket HANDSHAKE", ctx2.serviceInstanceId);
-                  ws.emit("handshake", {
-                    serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
-                    __status: "success"
-                  });
-                  CadenzaService.broker.emit("meta.socket.handshake", ctx2);
-                });
-                ws.on(
-                  "delegation",
-                  (ctx2, callback) => {
-                    const deputyExecId = ctx2.__metadata.__deputyExecId;
-                    CadenzaService.createEphemeralMetaTask(
-                      "Resolve delegation",
-                      callback,
-                      "Resolves a delegation request using the provided callback from the client (.emitWithAck())"
-                    ).doOn(`meta.node.graph_completed:${deputyExecId}`).emits(`meta.socket.delegation_resolved:${deputyExecId}`);
-                    CadenzaService.createEphemeralMetaTask(
-                      "Delegation progress update",
-                      (ctx3) => {
-                        if (ctx3.__progress !== void 0)
-                          ws.emit("delegation_progress", ctx3);
-                      },
-                      "Updates delegation progress",
-                      {
-                        once: false,
-                        destroyCondition: (ctx3) => {
-                          var _a2;
-                          return ctx3.data.progress === 1 || ((_a2 = ctx3.data) == null ? void 0 : _a2.progress) === void 0;
-                        }
-                      }
-                    ).doOn(
-                      `meta.node.routine_execution_progress:${deputyExecId}`,
-                      `meta.node.graph_completed:${deputyExecId}`
-                    ).emitsOnFail(
-                      `meta.socket.progress_failed:${deputyExecId}`
-                    );
-                    CadenzaService.broker.emit(
-                      "meta.socket.delegation_requested",
-                      ctx2
-                    );
-                  }
-                );
-                ws.on(
-                  "signal",
-                  (ctx2, callback) => {
-                    if (CadenzaService.broker.listObservedSignals().includes(ctx2.__signalName)) {
-                      callback({
-                        __status: "success",
-                        __signalName: ctx2.__signalName
-                      });
-                      CadenzaService.broker.emit(ctx2.__signalName, ctx2);
-                    } else {
-                      callback({
-                        __status: "error",
-                        __error: "No such signal",
-                        errored: true
-                      });
+          if (!server) {
+            console.error("Socket setup error: No server");
+            return __spreadProps(__spreadValues({}, ctx), { __error: "No server", errored: true });
+          }
+          server.on("connection", (ws) => {
+            console.log("SocketServer: New connection");
+            ws.on("handshake", (ctx2) => {
+              console.log("Socket HANDSHAKE", ctx2.serviceInstanceId);
+              ws.emit("handshake", {
+                serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
+                __status: "success"
+              });
+              CadenzaService.broker.emit("meta.socket.handshake", ctx2);
+            });
+            ws.on(
+              "delegation",
+              (ctx2, callback) => {
+                const deputyExecId = ctx2.__metadata.__deputyExecId;
+                CadenzaService.createEphemeralMetaTask(
+                  "Resolve delegation",
+                  callback,
+                  "Resolves a delegation request using the provided callback from the client (.emitWithAck())"
+                ).doOn(`meta.node.graph_completed:${deputyExecId}`).emits(`meta.socket.delegation_resolved:${deputyExecId}`);
+                CadenzaService.createEphemeralMetaTask(
+                  "Delegation progress update",
+                  (ctx3) => {
+                    if (ctx3.__progress !== void 0)
+                      ws.emit("delegation_progress", ctx3);
+                  },
+                  "Updates delegation progress",
+                  {
+                    once: false,
+                    destroyCondition: (ctx3) => {
+                      var _a3;
+                      return ctx3.data.progress === 1 || ((_a3 = ctx3.data) == null ? void 0 : _a3.progress) === void 0;
                     }
                   }
-                );
-                ws.on(
-                  "status_check",
-                  (ctx2, callback) => {
-                    CadenzaService.createEphemeralMetaTask(
-                      "Resolve status check",
-                      callback,
-                      "Resolves a status check request"
-                    ).doAfter(CadenzaService.serviceRegistry.getStatusTask);
-                    CadenzaService.broker.emit(
-                      "meta.socket.status_check_requested",
-                      ctx2
-                    );
-                  }
-                );
-                ws.on("disconnect", () => {
-                  CadenzaService.broker.emit("meta.socket.disconnected", {
-                    __wsId: ws.id
+                ).doOn(
+                  `meta.node.routine_execution_progress:${deputyExecId}`,
+                  `meta.node.graph_completed:${deputyExecId}`
+                ).emitsOnFail(`meta.socket.progress_failed:${deputyExecId}`);
+                CadenzaService.broker.emit("meta.socket.delegation_requested", ctx2);
+              }
+            );
+            ws.on(
+              "signal",
+              (ctx2, callback) => {
+                if (CadenzaService.broker.listObservedSignals().includes(ctx2.__signalName)) {
+                  callback({
+                    __status: "success",
+                    __signalName: ctx2.__signalName
                   });
-                });
-                CadenzaService.broker.emit("meta.socket.connected", { __wsId: ws.id });
+                  CadenzaService.broker.emit(ctx2.__signalName, ctx2);
+                } else {
+                  callback({
+                    __status: "error",
+                    __error: "No such signal",
+                    errored: true
+                  });
+                }
+              }
+            );
+            ws.on(
+              "status_check",
+              (ctx2, callback) => {
+                CadenzaService.createEphemeralMetaTask(
+                  "Resolve status check",
+                  callback,
+                  "Resolves a status check request"
+                ).doAfter(CadenzaService.serviceRegistry.getStatusTask);
+                CadenzaService.broker.emit("meta.socket.status_check_requested", ctx2);
+              }
+            );
+            ws.on("disconnect", () => {
+              console.log("SocketServer: Disconnected");
+              CadenzaService.broker.emit("meta.socket.disconnected", {
+                __wsId: ws.id
               });
-              CadenzaService.createMetaTask(
-                "Broadcast status",
-                (ctx2) => server.emit("status_update", ctx2),
-                "Broadcasts the status of the server to all clients"
-              ).doOn("meta.service.updated");
-              CadenzaService.createMetaTask(
-                "Shutdown SocketServer",
-                () => server.close(),
-                "Shuts down the socket server"
-              ).doOn("meta.socket_server_shutdown_requested").emits("meta.socket.shutdown");
-              return true;
-            },
-            "Starts socket server and initiates meta-handling"
-          ).emitsOnFail("meta.socket.failed")
-        )
+            });
+            CadenzaService.broker.emit("meta.socket.connected", { __wsId: ws.id });
+          });
+          CadenzaService.createMetaTask(
+            "Broadcast status",
+            (ctx2) => server.emit("status_update", ctx2),
+            "Broadcasts the status of the server to all clients"
+          ).doOn("meta.service.updated");
+          CadenzaService.createMetaTask(
+            "Shutdown SocketServer",
+            () => server.close(),
+            "Shuts down the socket server"
+          ).doOn("meta.socket_server_shutdown_requested").emits("meta.socket.shutdown");
+          return ctx;
+        })
       ],
       "Bootstraps the socket server"
     ).doOn("meta.rest.network_configured");
@@ -1554,6 +1554,7 @@ var SocketController = class _SocketController {
           CadenzaService.broker.emit("meta.socket_client.status_received", status);
         });
         socket.on("disconnect", () => {
+          console.log("SocketClient: Disconnected", serviceInstanceId);
           CadenzaService.broker.emit("meta.socket_client.disconnected", {
             serviceInstanceId
           });