@cadenza.io/service 1.10.6 → 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,
@@ -1352,6 +1352,12 @@ var SocketController = class _SocketController {
             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();
               });