@cadenza.io/service 1.21.2 → 1.21.4

package/dist/index.js

@@ -1583,9 +1583,9 @@ var SocketController = class _SocketController {
           console.log("SocketServer: Setting up", ctx);
           let server;
           server = new import_socket.Server(ctx.__httpsServer ?? ctx.__httpServer);
-          console.log("SocketServer:", server);
           const profile = ctx.__securityProfile ?? "medium";
           server.use((socket, next) => {
+            console.log("Middleware running for socket:", socket.id);
             const origin = socket?.handshake?.headers?.origin;
             const allowedOrigins = ["*"];
             const networkType = ctx.__networkType ?? "internal";
@@ -1600,8 +1600,9 @@ var SocketController = class _SocketController {
               high: { points: 1e3, duration: 60, blockDuration: 300 }
             };
             const limiter = new import_rate_limiter_flexible2.RateLimiterMemory(limiterOptions[profile]);
-            socket.use((packet, next2) => {
-              limiter.consume(socket?.handshake?.address || "unknown").then(() => next2()).catch((rej) => {
+            const clientKey = socket.handshake.address || "unknown";
+            socket.use((packet, packetNext) => {
+              limiter.consume(clientKey).then(() => next()).catch((rej) => {
                 if (rej.msBeforeNext > 0) {
                   console.log(
                     "SocketServer: Rate limit exceeded",
@@ -1611,9 +1612,11 @@ var SocketController = class _SocketController {
                     message: "Rate limit exceeded",
                     retryAfter: rej.msBeforeNext / 1e3
                   });
+                  packetNext(new Error("Rate limit exceeded"));
                 } else {
                   console.log("SocketServer: Rate limit exceeded, blocked");
                   socket.disconnect(true);
+                  packetNext(new Error("Blocked"));
                 }
               });
             });
@@ -1625,7 +1628,7 @@ var SocketController = class _SocketController {
             return { ...ctx, __error: "No server", errored: true };
           }
           server.on("connection", (ws) => {
-            console.log("SocketServer: New connection");
+            console.log("SocketServer: New connection", ws.name);
             try {
               ws.emit("handshake", {
                 serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
@@ -1633,7 +1636,7 @@ var SocketController = class _SocketController {
                 __status: "success"
               });
               ws.on("handshake", (ctx2) => {
-                console.log("Socket HANDSHAKE", ctx2.serviceInstanceId);
+                console.log("Socket HANDSHAKE", ctx2);
                 if (ctx2.isFrontend) {
                   const fetchId = `browser:${ctx2.serviceInstanceId}`;
                   CadenzaService.createMetaTask(
@@ -1765,10 +1768,11 @@ var SocketController = class _SocketController {
           reconnectionDelay: 1e3,
           reconnectionDelayMax: 1e4,
           randomizationFactor: 0.5,
-          retries: 5
+          retries: 5,
+          transports: ["websocket"]
         });
         socket.on("connect", () => {
-          console.log("SocketClient: CONNECTED");
+          console.log("SocketClient: CONNECTED", socket.id, socket.io);
           CadenzaService.broker.emit("meta.socket_client.connected", ctx);
         });
         socket.on("handshake", (ctx2) => {
@@ -1799,6 +1803,9 @@ var SocketController = class _SocketController {
           console.error("SocketClient: connect_error", err);
           CadenzaService.broker.emit("meta.socket_client.connect_error", err);
         });
+        socket.on("timeout", (event) => {
+          console.error(event, "timed out \u2014 server didn\u2019t respond");
+        });
         socket.on("error", (err) => {
           console.error("SocketClient: error", err);
           CadenzaService.broker.emit("meta.socket_client.error", err);
@@ -1819,7 +1826,7 @@ var SocketController = class _SocketController {
             }
             return new Promise((resolve, reject) => {
               delete ctx2.__isSubMeta;
-              console.log("Socket Delegate:", ctx2);
+              console.log("Socket Delegate:", socket.connected, ctx2);
               socket.timeout(1e4).emit(
                 "delegation",
                 ctx2,
@@ -4031,11 +4038,22 @@ var CadenzaService = class {
     });
     import_core3.default.createEphemeralMetaTask("Set database connection", () => {
       console.log("Database service created");
-      this.createCadenzaService(name, description, options);
-    }).doOn("meta.database.setup_done");
-    if (options.cadenzaDB?.connect) {
-      import_core3.default.createEphemeralMetaTask("Insert database service", (_, emit) => {
-        emit("meta.created_database_service", {
+      if (options.cadenzaDB?.connect) {
+        import_core3.default.createEphemeralMetaTask(
+          "Insert database service",
+          (_, emit) => {
+            emit("meta.created_database_service", {
+              data: {
+                service_name: name,
+                description,
+                schema,
+                is_meta: options.isMeta
+              }
+            });
+          }
+        ).doOn("meta.service_registry.service_inserted");
+      } else {
+        import_core3.default.broker.emit("meta.created_database_service", {
           data: {
             service_name: name,
             description,
@@ -4043,17 +4061,9 @@ var CadenzaService = class {
             is_meta: options.isMeta
           }
         });
-      }).doOn("meta.service_registry.service_inserted");
-    } else {
-      import_core3.default.broker.emit("meta.created_database_service", {
-        data: {
-          service_name: name,
-          description,
-          schema,
-          is_meta: options.isMeta
-        }
-      });
-    }
+      }
+      this.createCadenzaService(name, description, options);
+    }).doOn("meta.database.setup_done");
   }
   static createMetaDatabaseService(name, schema, description = "", options = {}) {
     this.bootstrap();