return exitCode for virtualcam install, uninstall, & start functions (#1558)

* return exitCode for virtualcam install, uninstall, & start functions. 
* frontend will synthesize the error message

Author: sandboxcoder

obs-studio-client/source/nodeobs_service.cpp

@@ -383,10 +383,9 @@ Napi::Value service::OBS_service_startVirtualCam(const Napi::CallbackInfo &info)
 	// On macOS, we will wait for a response. Our situation is more complicated due to the vcam SystemExtension
 	// which will return errors that we need to display to the user.
 	std::vector<ipc::value> response = conn->call_synchronous_helper("NodeOBS_Service", "OBS_service_startVirtualCam", {});
-
-	if (response.size() == 2) {
+	if (response.size() > 1) {
 		// We encountered an error setting up the vcam
-		return Napi::String::New(info.Env(), response.at(1).value_str);
+		Napi::Error::New(info.Env(), response[1].value_str).ThrowAsJavaScriptException();
 	}
 #else
 	conn->call("NodeOBS_Service", "OBS_service_startVirtualCam", {});
@@ -422,7 +421,7 @@ Napi::Value service::OBS_service_updateVirtualCam(const Napi::CallbackInfo &info
 
 Napi::Value service::OBS_service_installVirtualCamPlugin(const Napi::CallbackInfo &info)
 {
-	std::string message;
+	int errorCode = 0;
 #ifdef WIN32
 	SHELLEXECUTEINFO ShExecInfo = {0};
 	ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
@@ -442,14 +441,14 @@ Napi::Value service::OBS_service_installVirtualCamPlugin(const Napi::CallbackInf
 	CloseHandle(ShExecInfo.hProcess);
 
 #elif __APPLE__
-	message = g_util_osx->installPlugin();
+	errorCode = g_util_osx->installPlugin();
 #endif
-	return Napi::String::New(info.Env(), message);
+	return Napi::Number::New(info.Env(), errorCode);
 }
 
 Napi::Value service::OBS_service_uninstallVirtualCamPlugin(const Napi::CallbackInfo &info)
 {
-	std::string message;
+	int errorCode = 0;
 #ifdef WIN32
 	SHELLEXECUTEINFO ShExecInfo = {0};
 	ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
@@ -481,9 +480,9 @@ Napi::Value service::OBS_service_uninstallVirtualCamPlugin(const Napi::CallbackI
 		CloseHandle(ShExecInfo.hProcess);
 	}
 #elif __APPLE__
-	message = g_util_osx->uninstallPlugin();
+	errorCode = g_util_osx->uninstallPlugin();
 #endif
-	return Napi::String::New(info.Env(), message);
+	return Napi::Number::New(info.Env(), errorCode);
 }
 
 Napi::Value service::OBS_service_isVirtualCamPluginInstalled(const Napi::CallbackInfo &info)

obs-studio-client/source/util-osx-impl.mm

@@ -38,9 +38,9 @@ void uninstallLegacyDALPlugin()
 	}
 }
 
-std::string executeTaskAndCaptureOutput(const std::string &path, NSArray<NSString *> *exeArguments = nullptr)
+int executeTaskAndCaptureOutput(const std::string &path, NSArray<NSString *> *exeArguments = nullptr)
 {
-	std::string errorMessage;
+	int exitCode = 0;
 	@autoreleasepool {
 		@try {
 			// Create an NSTask instance
@@ -61,7 +61,7 @@ void uninstallLegacyDALPlugin()
 			[task launch];
 			[task waitUntilExit];
 
-			int exitCode = [task terminationStatus];
+			exitCode = [task terminationStatus];
 
 			// Read the data from the pipe
 			NSFileHandle *readHandle = [outputPipe fileHandleForReading];
@@ -71,19 +71,16 @@ void uninstallLegacyDALPlugin()
 			NSString *outputString = [[NSString alloc] initWithData:outputData encoding:NSUTF8StringEncoding];
 
 			// Print the captured output
-			if (exitCode != 0) {
-				errorMessage = outputString.UTF8String;
-			}
 			std::cout << "Child process output:\n" << outputString.UTF8String << std::endl;
 			std::cout << "Child process exited with code: " << exitCode << std::endl;
 		} @catch (NSException *exception) {
 			std::cout << "Caught an NSException!" << std::endl;
 			std::cout << "Name: " << [[exception name] UTF8String] << std::endl;
 			std::cout << "Reason: " << [[exception reason] UTF8String] << std::endl;
-			errorMessage = [[exception reason] UTF8String];
+			exitCode = 1;
 		}
 	}
-	return errorMessage;
+	return exitCode;
 }
 
 // In our app bundle, we will search for the slobs-virtual-cam-installer.app which
@@ -172,13 +169,13 @@ bool replace(std::string &str, const std::string &from, const std::string &to)
 	return true;
 }
 
-std::string UtilObjCInt::installPlugin()
+int UtilObjCInt::installPlugin()
 {
 	const std::string path = getInstallerAppPath();
 	return executeTaskAndCaptureOutput(path); // Run the installer
 }
 
-std::string UtilObjCInt::uninstallPlugin()
+int UtilObjCInt::uninstallPlugin()
 {
 	uninstallLegacyDALPlugin();
 	// Uninstall the camera system extension

obs-studio-client/source/util-osx-int.h

@@ -37,8 +37,8 @@ class UtilObjCInt {
 	void init(void);
 	void getPermissionsStatus(bool &webcam, bool &mic);
 	void requestPermissions(void *async_cb, perms_cb cb);
-	std::string installPlugin(void);
-	std::string uninstallPlugin(void);
+	int installPlugin(void);
+	int uninstallPlugin(void);
 	void setServerWorkingDirectoryPath(std::string path);
 	bool isPluginInstalled();
 

obs-studio-client/source/util-osx.cpp

@@ -44,12 +44,12 @@ void UtilInt::requestPermissions(void *async_cb, perms_cb cb)
 	_impl->requestPermissions(async_cb, cb);
 }
 
-std::string UtilInt::installPlugin(void)
+int UtilInt::installPlugin(void)
 {
 	return _impl->installPlugin();
 }
 
-std::string UtilInt::uninstallPlugin(void)
+int UtilInt::uninstallPlugin(void)
 {
 	return _impl->uninstallPlugin();
 }

obs-studio-client/source/util-osx.hpp

@@ -33,8 +33,8 @@ class UtilInt {
 	void init(void);
 	void getPermissionsStatus(bool &webcam, bool &mic);
 	void requestPermissions(void *async_cb, perms_cb cb);
-	std::string installPlugin(void);
-	std::string uninstallPlugin(void);
+	int installPlugin(void);
+	int uninstallPlugin(void);
 	void setServerWorkingDirectoryPath(std::string path);
 	bool isPluginInstalled();
 

obs-studio-server/source/nodeobs_service.cpp

@@ -3137,10 +3137,7 @@ void OBS_service::StartVirtualCam(std::vector<ipc::value> &rval)
 		virtualCamVideo = typeIsProgram ? obs_get_video() : obs_view_add(virtualCamView);
 
 		if (!virtualCamVideo) {
-			blog(LOG_ERROR, "Failed to create virtual camera video");
-			rval.push_back(ipc::value((uint64_t)ErrorCode::Error));
-			rval.push_back(ipc::value("Failed to create virtual camera video"));
-			return;
+			PRETTY_ERROR_RETURN(ErrorCode::Error, "Failed to create virtual camera video");
 		}
 	}
 
@@ -3149,10 +3146,8 @@ void OBS_service::StartVirtualCam(std::vector<ipc::value> &rval)
 	bool success = obs_output_start(virtualCam);
 	if (!success) {
 		const char *error = obs_output_get_last_error(virtualCam);
-		blog(LOG_ERROR, "Virtual Camera output start failed. Error: '%s'", error);
-		rval.push_back(ipc::value((uint64_t)ErrorCode::Error));
-		rval.push_back(ipc::value(error));
 		DestroyVirtualCamView();
+		PRETTY_ERROR_RETURN(ErrorCode::Error, error);
 	}
 
 	virtualCamActive = true;