Add option to get OBS output status from Javascript

Author: OsirisNL

README.md

@@ -55,7 +55,22 @@ window.addEventListener('obsSceneChanged', function(evt) {
 
 ### Get the current scene
 ```
-window.obsstudio.getCurrentScene(function(data) {console.log(data);});
+window.obsstudio.getCurrentScene(function(data) { console.log(data); });
+
+data is a Javascript object containing the following properties:
+* width
+* height
+* name
+```
+
+### Get OBS output status
+```
+window.obsstudio.getStatus(function data) { console.log(data); });
+
+data is a Javascript object containing the following properties:
+* recording (true/false)
+* streaming (true/false)
+* replaybuffer (true/false)
 ```
 
 ## Building on OSX

cef-isolation/browser-obs-bridge-mac.hpp

@@ -9,6 +9,7 @@ class BrowserOBSBridgeMac : public BrowserOBSBridge
 	BrowserOBSBridgeMac(id<CEFIsolationService> cefIsolationService);
 
     const char* GetCurrentSceneJSONData() override;
+	const char* GetStatus() override;
 
 private:
 	id<CEFIsolationService> cefIsolationService;	

cef-isolation/browser-obs-bridge-mac.mm

@@ -8,3 +8,8 @@
 {
 	return [cefIsolationService getCurrentSceneJSONData];
 }
+
+const char* BrowserOBSBridgeMac::GetStatus()
+{
+	return [cefIsolationService getStatus];
+}

obs-browser/apple/cef-isolation-service.mm

@@ -120,6 +120,12 @@ - (const char*)getCurrentSceneJSONData
 	return jsonString;
 }
 
+- (const char*)getStatus
+{
+	const char* jsonString = obsStatusToJSON();
+	return jsonString;
+}
+
 - (void)invalidateClient:(id)client withException:(NSException *)exception
 {
 	UNUSED_PARAMETER(client);

obs-browser/browser-obs-bridge-base.cpp

@@ -15,3 +15,9 @@ const char* BrowserOBSBridgeBase::GetCurrentSceneJSONData()
 
 	return jsonString; 
 }
+
+const char* BrowserOBSBridgeBase::GetStatus()
+{
+	const char* jsonString = obsStatusToJSON();
+	return jsonString;
+}

obs-browser/browser-obs-bridge-base.hpp

@@ -8,4 +8,5 @@ class BrowserOBSBridgeBase : public BrowserOBSBridge
 	BrowserOBSBridgeBase();
 
     const char* GetCurrentSceneJSONData() override;
+    const char* GetStatus() override;
 };

obs-browser/main-source.cpp

@@ -206,6 +206,7 @@ static void browser_source_destroy(void *data)
 	BrowserSource *bs = static_cast<BrowserSource *>(data);
 
 	delete bs;
+	bs = nullptr;
 }
 
 

shared-apple/cef-isolation.h

@@ -38,6 +38,7 @@
 		surfaceHandle:(BrowserSurfaceHandle)surfaceHandle;
 - (void)invalidateClient:(id)client withException:(NSException *)exception;
 - (const char*)getCurrentSceneJSONData;
+- (const char*)getStatus;
 @end
 
 @protocol CEFIsolatedClient

shared/browser-app.cpp

@@ -78,6 +78,9 @@ void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
 
 	CefRefPtr<CefV8Value> func = CefV8Value::CreateFunction("getCurrentScene", this);
   	obsStudioObj->SetValue("getCurrentScene", func, V8_PROPERTY_ATTRIBUTE_NONE);
+
+	CefRefPtr<CefV8Value> getStatus = CefV8Value::CreateFunction("getStatus", this);
+	obsStudioObj->SetValue("getStatus", getStatus, V8_PROPERTY_ATTRIBUTE_NONE);
 }
 
 void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
@@ -164,23 +167,33 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
 
 		return true;
 	}
-	else if (message->GetName() == "executeCallback") {
-        CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
+	else if (message->GetName() == "executeCallback")
+	{
+		CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
+		CefRefPtr<CefV8Value> retval;
+		CefRefPtr<CefV8Exception> exception;
 
-        context->Enter();
+		context->Enter();
+
+		CefRefPtr<CefListValue> arguments = message->GetArgumentList();
+		int callbackID = arguments->GetInt(0);
+		CefString jsonString = arguments->GetString(1);
 
-		int callbackID = message->GetArgumentList()->GetInt(0);
-		CefString jsonString = message->GetArgumentList()->GetString(1);
+		std::string script = fmt::format(
+			"JSON.parse('{}');",
+			arguments->GetString(1).ToString(),
+			jsonString.ToString().c_str());
 
 		CefRefPtr<CefV8Value> callback = callbackMap[callbackID];
 		CefV8ValueList args;
-		args.push_back(CefV8Value::CreateString(jsonString));
 
-		CefRefPtr<CefV8Value> retval;
-		CefRefPtr<CefV8Exception> exception;
-        callback->ExecuteFunction(NULL, args);
+		context->Eval(script, browser->GetMainFrame()->GetURL(), 0, retval, exception);
+
+		args.push_back(retval);
+
+		callback->ExecuteFunction(NULL, args);
 
-        context->Exit();
+		context->Exit();
 
 		callbackMap.erase(callbackID);
 
@@ -198,8 +211,8 @@ bool BrowserApp::Execute(const CefString& name,
 		CefRefPtr<CefV8Value>& retval,
 		CefString& exception)
 {
-	if (name == "getCurrentScene") {
-
+	if (name == "getCurrentScene")
+	{
 		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
 			callbackId++;
 			callbackMap[callbackId] = arguments[0];
@@ -215,6 +228,22 @@ bool BrowserApp::Execute(const CefString& name,
 
 		return true;
 	}
+	else if (name == "getStatus")
+	{
+		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
+			callbackId++;
+			callbackMap[callbackId] = arguments[0];
+		}
+
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("getStatus");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackId);
+
+		CefRefPtr<CefBrowser> browser = CefV8Context::GetCurrentContext()->GetBrowser();
+		browser->SendProcessMessage(PID_BROWSER, msg);
+
+		return true;
+	}
 
 	// Function does not exist.
 	return false;

shared/browser-client.cpp

@@ -105,5 +105,20 @@ bool BrowserClient::OnProcessMessageReceived(
 
 		return true;
 	}
+	else if (message_name == "getStatus") {
+
+		int callbackID = message->GetArgumentList()->GetInt(0);
+
+		CefString jsonString = browserOBSBridge->GetStatus();
+
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("executeCallback");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackID);
+		args->SetString(1, jsonString);
+
+		browser->SendProcessMessage(PID_RENDERER, msg);
+
+		return true;
+	}
 	return false;
 }