noobs 0.0.32 → 0.0.60

package/index.d.ts

@@ -1,3 +1,134 @@
+// OBS Data Types
+export type ObsDataValue = string | number | boolean | ObsData | ObsData[] | null;
+
+export interface ObsData {
+  [key: string]: ObsDataValue;
+}
+
+// OBS Property Types
+export type ObsPropertyType = 
+  | 'invalid'
+  | 'bool'
+  | 'int' 
+  | 'float'
+  | 'text'
+  | 'path'
+  | 'list'
+  | 'color'
+  | 'button'
+  | 'font'
+  | 'editable_list'
+  | 'frame_rate'
+  | 'group'
+  | 'color_alpha'
+  | 'unknown';
+
+export type ObsNumberType = 'scroller' | 'slider';
+
+export type ObsTextType = 'default' | 'password' | 'multiline' | 'info';
+
+export type ObsPathType = 'file' | 'file_save' | 'directory';
+
+export type ObsComboType = 'invalid' | 'editable' | 'list' | 'radio';
+
+export type ObsComboFormat = 'invalid' | 'int' | 'float' | 'string';
+
+export interface ObsListItem {
+  name: string;
+  value: string | number;
+  disabled: boolean;
+}
+
+export interface ObsPropertyBase {
+  name: string;
+  description: string;
+  type: ObsPropertyType;
+  enabled: boolean;
+  visible: boolean;
+}
+
+export interface ObsIntProperty extends ObsPropertyBase {
+  type: 'int';
+  min: number;
+  max: number;
+  step: number;
+  number_type: ObsNumberType;
+}
+
+export interface ObsFloatProperty extends ObsPropertyBase {
+  type: 'float';
+  min: number;
+  max: number;
+  step: number;
+  number_type: ObsNumberType;
+}
+
+export interface ObsTextProperty extends ObsPropertyBase {
+  type: 'text';
+  text_type: ObsTextType;
+}
+
+export interface ObsPathProperty extends ObsPropertyBase {
+  type: 'path';
+  path_type: ObsPathType;
+  filter: string;
+  default_path: string;
+}
+
+export interface ObsListProperty extends ObsPropertyBase {
+  type: 'list';
+  combo_type: ObsComboType;
+  combo_format: ObsComboFormat;
+  items: ObsListItem[];
+}
+
+export interface ObsBoolProperty extends ObsPropertyBase {
+  type: 'bool';
+}
+
+export interface ObsColorProperty extends ObsPropertyBase {
+  type: 'color' | 'color_alpha';
+}
+
+export interface ObsButtonProperty extends ObsPropertyBase {
+  type: 'button';
+}
+
+export interface ObsFontProperty extends ObsPropertyBase {
+  type: 'font';
+}
+
+export interface ObsEditableListProperty extends ObsPropertyBase {
+  type: 'editable_list';
+}
+
+export interface ObsFrameRateProperty extends ObsPropertyBase {
+  type: 'frame_rate';
+}
+
+export interface ObsGroupProperty extends ObsPropertyBase {
+  type: 'group';
+}
+
+export interface ObsGenericProperty extends ObsPropertyBase {
+  type: 'invalid' | 'unknown';
+}
+
+export type ObsProperty = 
+  | ObsIntProperty
+  | ObsFloatProperty
+  | ObsTextProperty
+  | ObsPathProperty
+  | ObsListProperty
+  | ObsBoolProperty
+  | ObsColorProperty
+  | ObsButtonProperty
+  | ObsFontProperty
+  | ObsEditableListProperty
+  | ObsFrameRateProperty
+  | ObsGroupProperty
+  | ObsGenericProperty;
+
 export type Signal = {
   id: string;   // Signal identifier, e.g. "stop"
   code: number; // 0 for success, other values for errors
@@ -21,18 +152,34 @@ interface Noobs {
     logPath: string, 
     dataPath: string,
     recordingPath: string,
-    cb: (signal: Signal) => void
+    cb: (signal: Signal) => void,
+    buffering: boolean,
   ): void;
 
   Shutdown(): void;
+  
+  // Recording functions
   StartBuffer(): void;
   StartRecording(offset: number): void;
   StopRecording(): void;
   GetLastRecording(): string;
+  SetRecordingDir(recordingPath: string): void;
+
+  // Source management functions
+  CreateSource(name: string, type: string): void;
+  DeleteSource(name: string): void;
+  GetSourceSettings(name: string): ObsData;
+  SetSourceSettings(name: string, settings: ObsData): void;
+  GetSourceProperties(name: string): ObsProperty[];
 
-  GetSourcePos(src: string): SceneItemPosition & SourceDimensions;
-  SetSourcePos(src: string, pos: SceneItemPosition): void;
+  // Scene management functions
+  AddSourceToScene(sourceName: string): void;
+  RemoveSourceFromScene(sourceName: string): void;
+  GetSourcePos(name: string): SceneItemPosition & SourceDimensions;
+  SetSourcePos(name: string, pos: SceneItemPosition): void;
+  // TODO: Cropping?
 
+  // Preview functions
   InitPreview(hwnd: Buffer): void;
   ShowPreview(x: number, y: number, width: number, height: number): void;
   HidePreview(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobs",
-  "version": "0.0.32",
+  "version": "0.0.60",
   "description": "A native Node.js addon with libobs bindings for Warcraft Recorder.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/main.cpp

@@ -1,24 +1,19 @@
 #include <napi.h>
 #include <windows.h>
-#include <tlhelp32.h>
-#include <string>
-#include <vector>
 #include <obs.h>
-#include <iostream>
-#include <future>
-#include <chrono>
-
 #include "obs_interface.h"
+#include "utils.h"
 
 ObsInterface* obs = nullptr;
 
 Napi::Value ObsInit(const Napi::CallbackInfo& info) {
-  bool valid = info.Length() == 5 &&
-   info[0].IsString() && // Plugin path
-   info[1].IsString() && // Log path
-   info[2].IsString() && // Data path
-   info[3].IsString() && // Recording path
-   info[4].IsFunction(); // JavaScript callback
+  bool valid = info.Length() == 6 &&
+   info[0].IsString() &&   // Plugin path
+   info[1].IsString() &&   // Log path
+   info[2].IsString() &&   // Data path
+   info[3].IsString() &&   // Recording path
+   info[4].IsFunction() && // JavaScript callback
+   info[5].IsBoolean();    // IsBuffer
 
   if (!valid) {
     Napi::Error::New(info.Env(), "Invalid arguments passed to ObsInit").ThrowAsJavaScriptException();
@@ -30,11 +25,12 @@ Napi::Value ObsInit(const Napi::CallbackInfo& info) {
   std::string dataPath = info[2].As<Napi::String>().Utf8Value();
   std::string recordingPath = info[3].As<Napi::String>().Utf8Value();
   Napi::Function fn = info[4].As<Napi::Function>();
+  bool isBuffer = info[5].As<Napi::Boolean>().Value();
 
   Napi::ThreadSafeFunction jscb =
     Napi::ThreadSafeFunction::New(info.Env(), fn, "JavaScript callback", 0, 1);
 
-  obs = new ObsInterface(pluginPath, logPath, dataPath, recordingPath, jscb);
+  obs = new ObsInterface(pluginPath, logPath, dataPath, recordingPath, jscb, isBuffer);
   return info.Env().Undefined();
 }
 
@@ -44,6 +40,24 @@ Napi::Value ObsShutdown(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
+Napi::Value ObsSetRecordingDir(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsSetRecordingDir called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetRecordingDir").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
+  }
+
+  std::string recordingPath = info[0].As<Napi::String>().Utf8Value();
+  obs->updateRecordingDir(recordingPath);
+  return info.Env().Undefined();
+}
+
 Napi::Value ObsStartBuffer(const Napi::CallbackInfo& info) {
   blog(LOG_INFO, "ObsStartBuffer called");
 
@@ -157,9 +171,174 @@ Napi::Value ObsHidePreview(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
+Napi::Value ObsCreateSource(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsCreateSource called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 2 &&
+   info[0].IsString() && // Source name
+   info[1].IsString();   // Source type
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsCreateSource").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  std::string type = info[1].As<Napi::String>().Utf8Value();
+
+  obs->createSource(name, type);
+  return info.Env().Undefined();
+}
+
+Napi::Value ObsDeleteSource(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsDeleteSource called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsDeleteSource").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  obs->deleteSource(name);
+  return info.Env().Undefined();
+}
+
+Napi::Value ObsGetSourceSettings(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsGetSourceSettings called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsGetSourceSettings").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+
+  obs_data_t* settings = obs->getSourceSettings(name);
+  Napi::Object result = data_to_napi(info.Env(), settings);
+  obs_data_release(settings);
+
+  return result;
+}
+
+Napi::Value ObsSetSourceSettings(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsSetSourceSettings called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 2 && info[0].IsString() && info[1].IsObject();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetSourceSettings").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+
+  Napi::Object obj = info[1].As<Napi::Object>();
+  obs_data_t* settings = napi_to_data(obj);
+  obs->setSourceSettings(name, settings);
+  obs_data_release(settings);
+
+  return info.Env().Undefined();
+}
+
+Napi::Value ObsGetSourceProperties(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsGetSourceProperties called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsGetSourceProperties").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  obs_properties_t* properties = obs->getSourceProperties(name);
+  Napi::Object result = properties_to_napi(info.Env(), properties);
+  obs_properties_destroy(properties);
+
+  return result;
+}
+
+Napi::Value ObsCreateScene(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsCreateScene called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 2 &&
+   info[0].IsString() && // Scene name
+   info[1].IsString();   // Source type
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsCreateScene").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  std::string type = info[1].As<Napi::String>().Utf8Value();
+
+  obs->createSource(name, type);
+  return info.Env().Undefined();
+}
+
+Napi::Value ObsAddSourceToScene(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsAddSourceToScene called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsAddSourceToScene").ThrowAsJavaScriptException();
+    return info.Env().Undefined();
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+
+  obs->addSourceToScene(name);
+  return info.Env().Undefined();
+}
+
+Napi::Value ObsRemoveSourceFromScene(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsRemoveSourceFromScene called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  bool valid = info.Length() == 1 && info[0].IsString();
+
+  if (!valid) {
+    Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsRemoveSourceFromScene").ThrowAsJavaScriptException();
+    return info.Env().Undefined();  
+  }
+
+  std::string name = info[0].As<Napi::String>().Utf8Value();
+  obs->removeSourceFromScene(name);
+  return info.Env().Undefined();
+}
+
 Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsUpdateSource called but obs is not initialized");
+    blog(LOG_ERROR, "ObsGetSourcePos called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
@@ -187,16 +366,13 @@ Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
 
 Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
   if (!obs) {
-    blog(LOG_ERROR, "ObsUpdateSource called but obs is not initialized");
+    blog(LOG_ERROR, "ObsSetSourcePos called but obs is not initialized");
     throw std::runtime_error("Obs not initialized");
   }
 
-  bool valid = info.Length() == 6 &&
+  bool valid = info.Length() == 2 &&
     info[0].IsString() && // Source name
-    info[1].IsNumber() && // X position (px)
-    info[2].IsNumber() && // Y position (px)
-    info[3].IsNumber() && // Scale factor (X)
-    info[4].IsNumber();   // Scale factor (Y)
+    info[1].IsObject();   // Position definition.
 
   if (!valid) {
     Napi::TypeError::New(info.Env(), "Invalid arguments passed to ObsSetSourcePos").ThrowAsJavaScriptException();
@@ -205,12 +381,13 @@ Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
 
   std::string name = info[0].As<Napi::String>().Utf8Value();
 
-  float x = info[1].As<Napi::Number>().FloatValue();
-  float y = info[2].As<Napi::Number>().FloatValue();
+  Napi::Object position = info[1].As<Napi::Object>();
+  float x = position.Get("x").As<Napi::Number>().FloatValue();
+  float y = position.Get("y").As<Napi::Number>().FloatValue();
   vec2 pos = { x, y };
 
-  float scaleX = info[3].As<Napi::Number>().FloatValue();
-  float scaleY = info[4].As<Napi::Number>().FloatValue();
+  float scaleX = position.Get("scaleX").As<Napi::Number>().FloatValue();
+  float scaleY = position.Get("scaleY").As<Napi::Number>().FloatValue();
   vec2 scale = { scaleX, scaleY };
 
   obs->setSourcePos(name, &pos, &scale);
@@ -220,18 +397,28 @@ Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
 Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("Init", Napi::Function::New(env, ObsInit));
   exports.Set("Shutdown", Napi::Function::New(env, ObsShutdown));
+  exports.Set("SetRecordingDir", Napi::Function::New(env, ObsSetRecordingDir));
 
   exports.Set("StartBuffer", Napi::Function::New(env, ObsStartBuffer));
   exports.Set("StartRecording", Napi::Function::New(env, ObsStartRecording));
   exports.Set("StopRecording", Napi::Function::New(env, ObsStopRecording));
   exports.Set("GetLastRecording", Napi::Function::New(env, ObsGetLastRecording));
 
+  exports.Set("CreateSource", Napi::Function::New(env, ObsCreateSource));
+  exports.Set("DeleteSource", Napi::Function::New(env, ObsDeleteSource));
+  exports.Set("GetSourceSettings", Napi::Function::New(env, ObsGetSourceSettings));
+  exports.Set("SetSourceSettings", Napi::Function::New(env, ObsSetSourceSettings));
+  exports.Set("GetSourceProperties", Napi::Function::New(env, ObsGetSourceProperties));
+
+  exports.Set("AddSourceToScene", Napi::Function::New(env, ObsAddSourceToScene));
+  exports.Set("RemoveSourceFromScene", Napi::Function::New(env, ObsRemoveSourceFromScene));
   exports.Set("GetSourcePos", Napi::Function::New(env, ObsGetSourcePos));
   exports.Set("SetSourcePos", Napi::Function::New(env, ObsSetSourcePos));
 
   exports.Set("InitPreview", Napi::Function::New(env, ObsInitPreview));
   exports.Set("ShowPreview", Napi::Function::New(env, ObsShowPreview));
   exports.Set("HidePreview", Napi::Function::New(env, ObsHidePreview));
+
   return exports;
 }