@cadenza.io/service 1.17.3 → 1.18.0

package/dist/index.d.mts

@@ -21883,6 +21883,7 @@ declare class GraphMetadataController {
 declare class RestController {
     private static _instance;
     static get instance(): RestController;
+    fetchDataWithTimeout: (url: string, requestInit: any, timeoutMs: number) => Promise<any>;
     constructor();
 }
 

package/dist/index.d.ts

@@ -21883,6 +21883,7 @@ declare class GraphMetadataController {
 declare class RestController {
     private static _instance;
     static get instance(): RestController;
+    fetchDataWithTimeout: (url: string, requestInit: any, timeoutMs: number) => Promise<any>;
     constructor();
 }
 

package/dist/index.js

@@ -961,11 +961,21 @@ var import_node_fs = __toESM(require("fs"));
 var import_node_https = __toESM(require("https"));
 var import_node_fetch = __toESM(require("node-fetch"));
 var RestController = class _RestController {
-  static get instance() {
-    if (!this._instance) this._instance = new _RestController();
-    return this._instance;
-  }
   constructor() {
+    this.fetchDataWithTimeout = async function(url, requestInit, timeoutMs) {
+      const signal = AbortSignal.timeout(timeoutMs);
+      try {
+        const response = await (0, import_node_fetch.default)(url, { ...requestInit, signal });
+        return await response.json();
+      } catch (error) {
+        if (error?.name === "AbortError") {
+          console.error("Fetch request timed out:", error);
+        } else {
+          console.error("Fetch error:", error);
+        }
+        throw error;
+      }
+    };
     CadenzaService.registry.getTaskByName.doOn(
       "meta.rest.delegation_requested",
       "meta.socket.delegation_requested"
@@ -1262,35 +1272,47 @@ var RestController = class _RestController {
           `Send Handshake to ${URL}`,
           async (ctx2, emit2) => {
             console.log("Sending handshake", ctx2);
-            const response = await (0, import_node_fetch.default)(`${URL}/handshake`, {
-              headers: {
-                "Content-Type": "application/json"
-              },
-              method: "POST",
-              body: JSON.stringify(ctx2.handshakeData)
-            });
-            const result = await response.json();
-            console.log("Handshake result", result);
-            if (result.__status !== "success") {
-              const error = result.__error ?? `Failed to connect to service ${serviceName} ${ctx2.serviceInstanceId}`;
-              console.error(error);
-              emit2(`meta.fetch.handshake_failed:${fetchId}`, result);
-              return { ...ctx2, __error: error, errored: true };
-            }
-            ctx2.serviceInstanceId = result.__serviceInstanceId;
-            console.log(`Connected to service ${serviceName} ${URL}`, result);
-            for (const communicationType of ctx2.communicationTypes) {
-              emit2("meta.fetch.service_communication_established", {
-                data: {
-                  serviceInstanceId: ctx2.serviceInstanceId,
-                  serviceInstanceClientId: CadenzaService.serviceRegistry.serviceInstanceId,
-                  communicationType
-                }
-              });
+            try {
+              const response = await this.fetchDataWithTimeout(
+                `${URL}/handshake`,
+                {
+                  headers: {
+                    "Content-Type": "application/json"
+                  },
+                  method: "POST",
+                  body: JSON.stringify(ctx2.handshakeData)
+                },
+                1e3
+              );
+              console.log("Handshake result", response);
+              if (response.__status !== "success") {
+                const error = response.__error ?? `Failed to connect to service ${serviceName} ${ctx2.serviceInstanceId}`;
+                console.error(error);
+                emit2(`meta.fetch.handshake_failed:${fetchId}`, response);
+                return { ...ctx2, __error: error, errored: true };
+              }
+              ctx2.serviceInstanceId = response.__serviceInstanceId;
+              console.log(
+                `Connected to service ${serviceName} ${URL}`,
+                response
+              );
+              for (const communicationType of ctx2.communicationTypes) {
+                emit2("meta.fetch.service_communication_established", {
+                  data: {
+                    serviceInstanceId: ctx2.serviceInstanceId,
+                    serviceInstanceClientId: CadenzaService.serviceRegistry.serviceInstanceId,
+                    communicationType
+                  }
+                });
+              }
+            } catch (e) {
+              console.error("Error in handshake", e);
+              return { ...ctx2, __error: e, errored: true };
             }
             return ctx2;
           },
-          "Sends handshake request"
+          "Sends handshake request",
+          { retryCount: 5, retryDelay: 1e3 }
         ).doOn(`meta.fetch.handshake_requested:${fetchId}`).emits("meta.fetch.handshake_complete");
         const delegateTask = CadenzaService.createMetaTask(
           `Delegate flow to REST server ${URL}`,
@@ -1337,14 +1359,17 @@ var RestController = class _RestController {
             }
             let response;
             try {
-              response = await (0, import_node_fetch.default)(`${URL}/signal`, {
-                headers: {
-                  "Content-Type": "application/json"
+              response = await this.fetchDataWithTimeout(
+                `${URL}/signal`,
+                {
+                  headers: {
+                    "Content-Type": "application/json"
+                  },
+                  method: "POST",
+                  body: JSON.stringify(ctx2)
                 },
-                method: "POST",
-                body: JSON.stringify(ctx2)
-              });
-              response = await response.json();
+                1e3
+              );
               console.log("SIGNAL TRANSMITTED", response);
               if (ctx2.__routineExecId) {
                 emit2(`meta.fetch.transmitted:${ctx2.__routineExecId}`, response);
@@ -1369,10 +1394,13 @@ var RestController = class _RestController {
           async (ctx2) => {
             let status;
             try {
-              const response = await (0, import_node_fetch.default)(`${URL}/status`, {
-                method: "GET"
-              });
-              status = await response.json();
+              status = await this.fetchDataWithTimeout(
+                `${URL}/status`,
+                {
+                  method: "GET"
+                },
+                1e3
+              );
             } catch (e) {
               status = {
                 __error: `Error: ${e}`,
@@ -1428,6 +1456,10 @@ var RestController = class _RestController {
       )
     ).doOn("meta.service_registry.dependee_registered").emitsOnFail("meta.fetch.connect_failed");
   }
+  static get instance() {
+    if (!this._instance) this._instance = new _RestController();
+    return this._instance;
+  }
 };
 
 // src/network/SocketController.ts
@@ -1738,7 +1770,7 @@ var SocketController = class _SocketController {
         return true;
       },
       "Connects to a specified socket server"
-    ).doOn("meta.service_registry.dependee_registered").emitsOnFail("meta.socket_client.connect_failed");
+    ).doOn("meta.fetch.handshake_complete").emitsOnFail("meta.socket_client.connect_failed");
   }
 };