@codebolt/codeboltjs 1.1.67 → 1.1.68

package/index.d.ts

@@ -139,7 +139,7 @@ declare class Codebolt {
             prependOnceListener<K_11>(eventName: string | symbol, listener: (...args: any[]) => void): any;
             eventNames(): (string | symbol)[];
         };
-        executeCommand: (command: string, executeInMain?: boolean) => Promise<import("@codebolt/types").CommandOutput | import("@codebolt/types").CommandError>;
+        executeCommand: (command: string, returnEmptyStringOnSuccess?: boolean) => Promise<unknown>;
         executeCommandRunUntilError: (command: string, executeInMain?: boolean) => Promise<import("@codebolt/types").CommandError>;
         sendManualInterrupt(): Promise<import("@codebolt/types").TerminalInterruptResponse>;
         executeCommandWithStream(command: string, executeInMain?: boolean): EventEmitter<[never]>;

package/modules/terminal.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { CommandError, CommandOutput, TerminalInterruptResponse } from '@codebolt/types';
+import { CommandError, TerminalInterruptResponse } from '@codebolt/types';
 /**
  * CustomEventEmitter class that extends the Node.js EventEmitter class.
  */
@@ -19,7 +19,7 @@ declare const cbterminal: {
      * @param {string} command - The command to be executed.
      * @returns {Promise<CommandOutput|CommandError>} A promise that resolves with the command's output, error, or finish signal.
      */
-    executeCommand: (command: string, executeInMain?: boolean) => Promise<CommandOutput | CommandError>;
+    executeCommand: (command: string, returnEmptyStringOnSuccess?: boolean) => Promise<unknown>;
     /**
      * Executes a given command and keeps running until an error occurs.
      * Listens for messages from the WebSocket and resolves the promise when an error is encountered.

package/modules/terminal.js

@@ -23,31 +23,18 @@ const cbterminal = {
      * @param {string} command - The command to be executed.
      * @returns {Promise<CommandOutput|CommandError>} A promise that resolves with the command's output, error, or finish signal.
      */
-    executeCommand: async (command, executeInMain = false) => {
+    executeCommand: async (command, returnEmptyStringOnSuccess = false) => {
         return new Promise((resolve, reject) => {
             websocket_1.default.getWebsocket.send(JSON.stringify({
                 "type": "executeCommand",
                 "message": command,
-                executeInMain
+                returnEmptyStringOnSuccess
             }));
             let result = "";
             websocket_1.default.getWebsocket.on('message', (data) => {
                 const response = JSON.parse(data);
-                if (response.type === "commandOutput" || response.type === "commandError" || response.type === "commandFinish") {
-                    if (response.type === "commandOutput") {
-                        // Initialize result as an empty string                
-                        result += response.stdout + "/n"; // Append the output
-                    }
-                    else if (response.type === "commandError") {
-                        result = response.stderr + "/n";
-                        ; // Set result to the error
-                        response.result = result;
-                        resolve(response); // Resolve with the result string
-                    }
-                    else if (response.type === "commandFinish") {
-                        response.result = result;
-                        resolve(response); // Resolve with the result string
-                    }
+                if (response.type === "commandError" || response.type === "commandFinish") {
+                    resolve(response);
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/codeboltjs",
-  "version": "1.1.67",
+  "version": "1.1.68",
   "description": "",
   "keywords": [],
   "author": "",

package/src/modules/terminal.ts

@@ -19,29 +19,18 @@ const cbterminal = {
      * @param {string} command - The command to be executed.
      * @returns {Promise<CommandOutput|CommandError>} A promise that resolves with the command's output, error, or finish signal.
      */
-    executeCommand: async (command: string,executeInMain=false): Promise<CommandOutput|CommandError> => {
+    executeCommand: async (command:string, returnEmptyStringOnSuccess:boolean = false) => {
         return new Promise((resolve, reject) => {
             cbws.getWebsocket.send(JSON.stringify({
                 "type": "executeCommand",
                 "message": command,
-                executeInMain
+                returnEmptyStringOnSuccess
             }));
             let result = "";
-            cbws.getWebsocket.on('message', (data: string) => {
+            cbws.getWebsocket.on('message', (data:string) => {
                 const response = JSON.parse(data);
-             
-                if (response.type === "commandOutput" || response.type === "commandError" || response.type === "commandFinish") {
-                    if (response.type === "commandOutput") {
-                        // Initialize result as an empty string                
-                        result += response.stdout + "/n"; // Append the output
-                    } else if (response.type === "commandError") {
-                        result = response.stderr + "/n";; // Set result to the error
-                        response.result = result;
-                        resolve(response); // Resolve with the result string
-                    } else if (response.type === "commandFinish") {
-                        response.result = result;
-                        resolve(response); // Resolve with the result string
-                    }
+                if (response.type === "commandError" || response.type === "commandFinish" ) {
+                   resolve(response)
                 }
             });
         });