@kumologica/sdk 3.6.4-beta4 → 3.6.4-beta6

package/cli/commands/run.js

@@ -54,6 +54,12 @@ exports.builder = (yargs) => {
     alias: "t",
     nargs: 1,
   });
+  yargs.option(`taskTimeout`, {
+    describe: "The timeout in seconds for task execution.",
+    type: "number",
+    alias: "o",
+    nargs: 1,
+  });
   yargs.option(`args`, {
     describe: "The list of arguments, either '-a one two three' or '-a one -a two -a three' ",
     type: "array",
@@ -67,13 +73,15 @@ exports.handler = async ({ project_directory, loglevel, port, taskName, args })
   // project_directory can point to a directory or a flow, so lets make sure that first the directory exists
   let absProjectDirectory;
   let exitCode = 1;
+
   try {
     absProjectDirectory = fs.realpathSync(projectDirectory);
   } catch (err) {
     logFatal(`Project not found: ${projectDirectory}`);
     process.exit(exitCode);
   }
-
+  
+  let server;
   try {
     // Resolve the path to the flow path
     const [projectFlowDirname, projectFlowFullPath] = resolveProjectFlowPath(absProjectDirectory);
@@ -87,38 +95,63 @@ exports.handler = async ({ project_directory, loglevel, port, taskName, args })
     };
 
     // Start a server
-    let server = new TaskServer({
-      flowPath: projectFlowFullPath,
-      cliParams,
-    });
+    server = new TaskServer(projectFlowFullPath, cliParams);
 
     await server.listen();
 
+    const got = require('got');
+
+    // Timeout in ms (default 10 minutes); make configurable via env or param if needed
+    const TIMEOUT_MS = process.env.TIMEOUT_MS || 1000000; // 10 minutes
+
     const tName = taskName || process.env.taskName;
-    const req = {
-      method: 'POST',
-      headers: {
-      },
-      body: JSON.stringify({args: args})
-    };
+    const url = `http://127.0.0.1:${port || 1880}/__task__/${tName}`;
+
+    try {
+      const response = await got(url, {
+        method: 'POST',
+        headers: { 
+          // Add any specific headers here if needed (e.g., 'Content-Type': 'application/json')
+        },
+        json: { args: args },  // Automatically stringifies to JSON and sets Content-Type
+        timeout: { request: TIMEOUT_MS }  // Full request timeout (headers + body)
+      });
+
+      // Log success and response details
+      logInfo('Request succeeded!');
+      logInfo('Status:', response.statusCode);
+      logInfo('Response body:', response.body);  // Assuming JSON response; parse if needed via response.json
+
+      exitCode = 0;
+
+    } catch (error) {
+      // Log failure details
+      logFatal('Task Error:', error.message);
+
+    //  if (error.response) {
+    //    logFatal('Status:', error.response.statusCode);
+    //    logFatal('Response body:', error.response.body);
+    //  }
+    //  if (error.code === 'ETIMEDOUT') {
+    //    logFatal('Timeout exceeded (', TIMEOUT_MS / 1000, 's)');
+    //  }
+    }
+  } catch (error) {
+      logFatal('Task failed!');
+      logFatal('Error:', error.message);
 
-    if (tName) {
-      const url = `http://127.0.0.1:${port||1880}/__task__/${tName}`;
-      
-      const response = await fetch(url, req);
-      const data = await response.text();
-      
-      logInfo("Status:  " + response.status);
-      logInfo("Message: " + data);
+  } 
 
+  try {
+    if (server) {
       await server.stop();
-      
-      exitCode = response.status >= 200 && response.status < 300 ? 0 : 1;
-      process.exit(exitCode);  // this is task, terminate after completion
-    } 
-  } catch (e) {
-    logFatal(e.message);
+    }
+  } catch (error) {
+    logError('Error stopping server:', error.message);
   }
+  logInfo('HTTP Server stopped.');
+
+  process.exit(exitCode);  // Error exit
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumologica/sdk",
-  "version": "3.6.4-beta4",
+  "version": "3.6.4-beta6",
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
@@ -83,9 +83,9 @@
     "@aws-sdk/credential-providers": "^3.556.0",
     "@aws-sdk/lib-dynamodb": "^3.549.0",
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.6.4-beta4",
-    "@kumologica/devkit": "3.6.4-beta4",
-    "@kumologica/runtime": "3.6.4-beta4",
+    "@kumologica/builder": "3.6.4-beta6",
+    "@kumologica/devkit": "3.6.4-beta6",
+    "@kumologica/runtime": "3.6.4-beta6",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",
     "basic-auth": "2.0.1",

package/src/server/TaskServer.js

@@ -5,6 +5,7 @@ const {
   PLATFORMS,
 } = require("@kumologica/runtime");
 
+const tcpPortUsed = require("tcp-port-used");
 
 /**
  * This class will encapsulate the adminApp and FlowApp into two servers.
@@ -32,12 +33,26 @@ class TaskServer {
             { noadmin: true }
         );
 
-       this.config = { ...baseConfig, ...params };
+        this.config = { ...baseConfig, ...params };
 
-        this.flowServer = new AbstractServerfulServer(this.config);
+        console.log(`Runtime configuration:${JSON.stringify(this.config)}`);
     }
 
+    async allocatePort(port) {
+        let inUse = await tcpPortUsed.check(port);
+        if (inUse) {
+          let newPort = port + 1;
+          console.log(`> Port: ${port} in use. Trying with port: ${newPort}...`);
+          return await this.allocatePort(newPort);
+        } else {
+          return port;
+        }
+      }
+    
     async listen() {
+        this.config.port = await this.allocatePort(this.config.port || 1880);
+        this.flowServer = new AbstractServerfulServer(this.config);
+
         await this.flowServer.start();
         this.flowServer.log.debug(`Runtime configuration:${JSON.stringify(this.config)}`);
     }