return error messaging from Apple system extension

* update mac-virtualcam code path to return output if an error occurs

Author: sandboxcoder

obs-studio-client/source/nodeobs_service.cpp

@@ -422,7 +422,7 @@ Napi::Value service::OBS_service_updateVirtualCam(const Napi::CallbackInfo &info
 
 Napi::Value service::OBS_service_installVirtualCamPlugin(const Napi::CallbackInfo &info)
 {
-	bool isInstalled = true;
+    std::string message;
 #ifdef WIN32
 	SHELLEXECUTEINFO ShExecInfo = {0};
 	ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
@@ -442,9 +442,9 @@ Napi::Value service::OBS_service_installVirtualCamPlugin(const Napi::CallbackInf
 	CloseHandle(ShExecInfo.hProcess);
 
 #elif __APPLE__
-	isInstalled = g_util_osx->installPlugin();
+    message = g_util_osx->installPlugin();
 #endif
-	return Napi::Boolean::New(info.Env(), isInstalled);
+	return Napi::String::New(info.Env(), message);
 }
 
 Napi::Value service::OBS_service_uninstallVirtualCamPlugin(const Napi::CallbackInfo &info)

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

@@ -38,9 +38,9 @@ void uninstallLegacyDALPlugin()
 	}
 }
 
-bool executeTaskAndCaptureOutput(const std::string &path, NSArray<NSString *> *exeArguments = nullptr)
+std::string executeTaskAndCaptureOutput(const std::string &path, NSArray<NSString *> *exeArguments = nullptr)
 {
-	bool success = true;
+    std::string errorMessage;
 	@autoreleasepool {
 		@try {
 			// Create an NSTask instance
@@ -71,16 +71,19 @@ bool executeTaskAndCaptureOutput(const std::string &path, NSArray<NSString *> *e
 			NSString *outputString = [[NSString alloc] initWithData:outputData encoding:NSUTF8StringEncoding];
 
 			// Print the captured output
-			std::cout << "Child process output:\n" << [outputString UTF8String] << std::endl;
+            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;
-			success = false;
+            errorMessage = [[exception reason] UTF8String];
 		}
 	}
-	return success;
+	return errorMessage;
 }
 
 // In our app bundle, we will search for the slobs-virtual-cam-installer.app which
@@ -169,19 +172,18 @@ bool replace(std::string &str, const std::string &from, const std::string &to)
 	return true;
 }
 
-bool UtilObjCInt::installPlugin()
+std::string UtilObjCInt::installPlugin()
 {
 	const std::string path = getInstallerAppPath();
 	return executeTaskAndCaptureOutput(path); // Run the installer
 }
 
-void UtilObjCInt::uninstallPlugin()
+std::string UtilObjCInt::uninstallPlugin()
 {
+    uninstallLegacyDALPlugin();
 	// Uninstall the camera system extension
 	const std::string path = getInstallerAppPath();
 	return executeTaskAndCaptureOutput(path, @[@"--deactivate"]); // Run the uninstaller
-
-	uninstallLegacyDALPlugin();
 }
 
 bool UtilObjCInt::isPluginInstalled()

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);
-	bool installPlugin(void);
-	void uninstallPlugin(void);
+	std::string installPlugin(void);
+    std::string uninstallPlugin(void);
 	void setServerWorkingDirectoryPath(std::string path);
 	bool isPluginInstalled();
 

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

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

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);
-	bool installPlugin(void);
-	void uninstallPlugin(void);
+    std::string installPlugin(void);
+    std::string uninstallPlugin(void);
 	void setServerWorkingDirectoryPath(std::string path);
 	bool isPluginInstalled();