Merge pull request #20 from devicecloud-dev/fix-output-logging

fix output logging and version fix

Author: riglar

dist/index.js

@@ -32570,18 +32570,46 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const core_1 = __nccwpck_require__(2186);
 const params_1 = __nccwpck_require__(5966);
 const child_process_1 = __nccwpck_require__(2081);
+const dcdVersionString = '@devicecloud.dev/dcd@>=3.3.6';
 const escapeShellValue = (value) => {
     // Escape special characters that could cause shell interpretation issues
     return value.replace(/(["\\'$`!\s\[\]{}()&|;<>*?#^~])/g, '\\$1');
 };
+const executeCommand = (command, log = true) => {
+    return new Promise((resolve, reject) => {
+        const [cmd, ...args] = command.split(' ');
+        let output = '';
+        const process = (0, child_process_1.spawn)(cmd, args, { shell: true });
+        process.stdout.on('data', (data) => {
+            const chunk = data.toString();
+            output += chunk;
+            if (log) {
+                console.info(chunk);
+            }
+        });
+        process.stderr.on('data', (data) => {
+            const chunk = data.toString();
+            output += chunk;
+            if (log) {
+                console.error(chunk);
+            }
+        });
+        process.on('close', (code) => {
+            resolve({ output, exitCode: code !== null && code !== void 0 ? code : 0 });
+        });
+        process.on('error', (err) => {
+            reject(err);
+        });
+    });
+};
 const getTestStatus = (uploadId, apiKey, apiUrl) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        let command = `npx --yes @devicecloud.dev/dcd status --json --upload-id ${uploadId} --api-key ${escapeShellValue(apiKey)}`;
+        let command = `npx --yes "${dcdVersionString}" status --json --upload-id ${uploadId} --api-key ${escapeShellValue(apiKey)}`;
         if (apiUrl) {
             command += ` --api-url ${escapeShellValue(apiUrl)}`;
         }
-        const statusOutput = (0, child_process_1.execSync)(command, { encoding: 'utf-8' });
-        return JSON.parse(statusOutput);
+        const { output } = yield executeCommand(command, false);
+        return JSON.parse(output);
     }
     catch (error) {
         console.warn('Failed to get test status:', error);
@@ -32640,13 +32668,10 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         // Execute the test command and capture the upload ID
         let uploadId = null;
-        let testOutput;
+        let testOutput = '';
         try {
-            testOutput = (0, child_process_1.execSync)(`npx --yes  --no-cache @devicecloud.dev/dcd cloud ${paramsString} --quiet`, { encoding: 'utf-8' });
-        }
-        catch (e) {
-            testOutput = e.output[1].toString();
-            const exitCode = e.status || 1;
+            const { output, exitCode } = yield executeCommand(`npx --yes "${dcdVersionString}" cloud ${paramsString} --quiet`);
+            testOutput = output;
             if (exitCode === 1) {
                 throw new Error('DeviceCloud CLI failed to run - check your parameters or contact support');
             }
@@ -32675,7 +32700,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
                 console.info('Successfully completed test run.');
             }
             else if (result.status === 'FAILED') {
-                (0, core_1.setFailed)('Test run failed. Check flow results for details.');
+                (0, core_1.setFailed)(`Test run failed. Check flow results for details: ${result.consoleUrl}`);
             }
         }
         else {

package.json

@@ -2,7 +2,7 @@
   "name": "dcd-github-action",
   "description": "run maestro tests on devicecloud.dev",
   "author": "devicecloud.dev",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "src/index.ts",
   "license": "MIT",
   "engines": {

src/index.ts

@@ -1,6 +1,8 @@
 import { setFailed, setOutput } from '@actions/core';
 import { getParameters } from './methods/params';
-import { execSync } from 'child_process';
+import { spawn } from 'child_process';
+
+const dcdVersionString = '@devicecloud.dev/dcd@>=3.3.6';
 
 const escapeShellValue = (value: string): string => {
   // Escape special characters that could cause shell interpretation issues
@@ -19,20 +21,56 @@ interface StatusResponse {
   appBinaryId?: string;
 }
 
+const executeCommand = (
+  command: string,
+  log: boolean = true
+): Promise<{ output: string; exitCode: number }> => {
+  return new Promise((resolve, reject) => {
+    const [cmd, ...args] = command.split(' ');
+    let output = '';
+
+    const process = spawn(cmd, args, { shell: true });
+
+    process.stdout.on('data', (data) => {
+      const chunk = data.toString();
+      output += chunk;
+      if (log) {
+        console.info(chunk);
+      }
+    });
+
+    process.stderr.on('data', (data) => {
+      const chunk = data.toString();
+      output += chunk;
+      if (log) {
+        console.error(chunk);
+      }
+    });
+
+    process.on('close', (code) => {
+      resolve({ output, exitCode: code ?? 0 });
+    });
+
+    process.on('error', (err) => {
+      reject(err);
+    });
+  });
+};
+
 const getTestStatus = async (
   uploadId: string,
   apiKey: string,
   apiUrl?: string
 ): Promise<StatusResponse | null> => {
   try {
-    let command = `npx --yes @devicecloud.dev/dcd status --json --upload-id ${uploadId} --api-key ${escapeShellValue(
+    let command = `npx --yes "${dcdVersionString}" status --json --upload-id ${uploadId} --api-key ${escapeShellValue(
       apiKey
     )}`;
     if (apiUrl) {
       command += ` --api-url ${escapeShellValue(apiUrl)}`;
     }
-    const statusOutput = execSync(command, { encoding: 'utf-8' });
-    return JSON.parse(statusOutput);
+    const { output } = await executeCommand(command, false);
+    return JSON.parse(output);
   } catch (error) {
     console.warn('Failed to get test status:', error);
     return null;
@@ -121,16 +159,14 @@ const run = async (): Promise<void> => {
 
     // Execute the test command and capture the upload ID
     let uploadId: string | null = null;
+    let testOutput = '';
 
-    let testOutput;
     try {
-      testOutput = execSync(
-        `npx --yes  --no-cache @devicecloud.dev/dcd cloud ${paramsString} --quiet`,
-        { encoding: 'utf-8' }
+      const { output, exitCode } = await executeCommand(
+        `npx --yes "${dcdVersionString}" cloud ${paramsString} --quiet`
       );
-    } catch (e: any) {
-      testOutput = e.output[1].toString();
-      const exitCode = e.status || 1;
+      testOutput = output;
+
       if (exitCode === 1) {
         throw new Error(
           'DeviceCloud CLI failed to run - check your parameters or contact support'
@@ -169,7 +205,9 @@ const run = async (): Promise<void> => {
       if (result.status === 'PASSED') {
         console.info('Successfully completed test run.');
       } else if (result.status === 'FAILED') {
-        setFailed('Test run failed. Check flow results for details.');
+        setFailed(
+          `Test run failed. Check flow results for details: ${result.consoleUrl}`
+        );
       }
     } else {
       setOutput('DEVICE_CLOUD_UPLOAD_STATUS', 'ERROR');