Merge pull request #195 from HarperFast/CORE-3040

CLI errors exit with code 1 and error message cleanup

Author: DavidCockerill

bin/cliOperations.js

@@ -143,12 +143,12 @@ async function cliOperations(req) {
 		initConfig();
 		if (!getHdbPid()) {
 			console.error('Harper must be running to perform this operation');
-			process.exit();
+			process.exit(1);
 		}
 
 		if (!fs.existsSync(envMgr.get(terms.CONFIG_PARAMS.OPERATIONSAPI_NETWORK_DOMAINSOCKET))) {
 			console.error('No domain socket found, unable to perform this operation');
-			process.exit();
+			process.exit(1);
 		}
 	}
 	await PREPARE_OPERATION[req.operation]?.(req);
@@ -178,22 +178,33 @@ async function cliOperations(req) {
 			};
 		}
 
+		let responseLog;
 		if (req.json) {
-			console.log(JSON.stringify(responseData, null, 2));
+			responseLog = JSON.stringify(responseData, null, 2)
 		} else {
-			console.log(YAML.stringify(responseData).trim());
+			responseLog = YAML.stringify(responseData).trim()
 		}
 
+		const { statusCode } = response;
+		if (statusCode < 200 || (statusCode >= 300 && statusCode !== 304)) {
+			const errorPrefix = responseLog.startsWith('error:') ? '' : 'error: ';
+			console.error(`${errorPrefix}${responseLog}`);
+			process.exit(1);
+		}
+
+		console.log(responseLog);
+
 		return responseData;
 	} catch (err) {
-		let errMsg = 'Error: ';
-		if (err?.response?.data?.error) {
-			errMsg += err.response.data.error;
-		} else if (err?.response?.data) {
-			errMsg += err?.response?.data;
+		if (err.code === 'ENOENT' || err.code === 'ECONNREFUSED') {
+			console.error(`error: Failed to connect to Harper (${err.code}): ${err.message}`);
+		} else if (err.code === 'EACCES') {
+			console.error(`error: Permission denied accessing the domain socket: ${err.message}`);
+		} else if (err.code === 'ENOTFOUND') {
+			console.error(`error: Host not found: "${err.hostname}" ${err.message}`);
 		} else {
-			return console.error(err);
+			console.error(`error: ${err.message ?? err}`);
 		}
-		console.error(errMsg);
+		process.exit(1);
 	}
 }