Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    obsws (0.2.1)
+    obsws (0.2.0)
+      observer (~> 0.1.1)
       waitutil (~> 0.2.1)
       websocket-driver (~> 0.7.5)
 
@@ -13,6 +14,7 @@ GEM
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
     minitest (5.16.3)
+    observer (0.1.1)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)

examples/events/main.rb

@@ -11,7 +11,7 @@ class Main
     @e_client = OBSWS::Events::Client.new(**kwargs)
     @e_client.add_observer(self)
 
-    puts infostring
+    puts info.join("\n")
     @running = true
   end
 
@@ -19,14 +19,14 @@ class Main
     sleep(0.1) while running
   end
 
-  def infostring
+  def info
     resp = @r_client.get_version
     [
       "Using obs version:",
       resp.obs_version,
       "With websocket version:",
       resp.obs_web_socket_version
-    ].join("\n")
+    ]
   end
 
   def on_current_program_scene_changed(data)

lib/obsws/base.rb

@@ -2,6 +2,7 @@ require "socket"
 require "websocket/driver"
 require "digest/sha2"
 require "json"
+require "observer"
 require "waitutil"
 
 require_relative "mixin"
@@ -22,10 +23,10 @@ module OBSWS
   end
 
   class Base
+    include Observable
     include Mixin::OPCodes
 
-    attr_reader :closed
-    attr_writer :updater
+    attr_reader :id, :driver, :closed
 
     def initialize(**kwargs)
       host = kwargs[:host] || "localhost"
@@ -55,7 +56,7 @@ module OBSWS
       ) { @identified }
     end
 
-    private def start_driver
+    def start_driver
       Thread.new do
         @driver.start
 
@@ -67,12 +68,6 @@ module OBSWS
       end
     end
 
-    public def stop_driver
-      @driver.close
-    end
-
-    private
-
     def auth_token(salt:, challenge:)
       Digest::SHA256.base64digest(
         Digest::SHA256.base64digest(@password + salt) + challenge
@@ -104,11 +99,12 @@ module OBSWS
       when Mixin::OPCodes::IDENTIFIED
         @identified = true
       when Mixin::OPCodes::EVENT, Mixin::OPCodes::REQUESTRESPONSE
-        @updater.call(data[:op], data[:d])
+        changed
+        notify_observers(data[:op], data[:d])
       end
     end
 
-    public def req(id, type_, data = nil)
+    def req(id, type_, data = nil)
       payload = {
         op: Mixin::OPCodes::REQUEST,
         d: {

lib/obsws/event.rb

@@ -70,18 +70,20 @@ module OBSWS
         kwargs[:subs] ||= SUBS::LOW_VOLUME
         @base_client = Base.new(**kwargs)
         LOGGER.info("#{self} succesfully identified with server")
-        @base_client.updater = ->(op_code, data) {
-          if op_code == Mixin::OPCodes::EVENT
-            event = data[:eventType]
-            data = data.fetch(:eventData, {})
-            notify_observers(event, Mixin::Data.new(data, data.keys))
-          end
-        }
+        @base_client.add_observer(self)
       end
 
       def to_s
         self.class.name.split("::").last(2).join("::")
       end
+
+      def update(op_code, data)
+        if op_code == Mixin::OPCodes::EVENT
+          event = data[:eventType]
+          data = data.key?(:eventData) ? data[:eventData] : {}
+          notify_observers(event, Mixin::Data.new(data, data.keys))
+        end
+      end
     end
   end
 end

lib/obsws/mixin.rb

@@ -18,7 +18,7 @@ module OBSWS
       def initialize(resp, fields)
         @resp = resp
         @fields = fields
-        make_field_methods(*fields)
+        self.make_field_methods *fields
       end
 
       def empty? = @fields.empty?
@@ -33,11 +33,9 @@ module OBSWS
     end
 
     module TearDown
-      def stop_driver
-        @base_client.stop_driver
+      def close
+        @base_client.driver.close
       end
-
-      alias_method :close, :stop_driver
     end
 
     module OPCodes

lib/obsws/req.rb

@@ -15,9 +15,7 @@ module OBSWS
       def initialize(**kwargs)
         @base_client = Base.new(**kwargs)
         LOGGER.info("#{self} succesfully identified with server")
-        @base_client.updater = ->(op_code, data) {
-          @response = data if op_code == Mixin::OPCodes::REQUESTRESPONSE
-        }
+        @base_client.add_observer(self)
         @response = {requestId: 0}
       end
 
@@ -28,7 +26,7 @@ module OBSWS
       def run
         yield(self)
       ensure
-        stop_driver
+        close
         WaitUtil.wait_for_condition(
           "driver to close",
           delay_sec: 0.01,
@@ -36,6 +34,10 @@ module OBSWS
         ) { @base_client.closed }
       end
 
+      def update(op_code, data)
+        @response = data if op_code == Mixin::OPCodes::REQUESTRESPONSE
+      end
+
       def call(req, data = nil)
         id = rand(1..1000)
         @base_client.req(id, req, data)

lib/obsws/version.rb

@@ -11,7 +11,7 @@ module OBSWS
     end
 
     def patch
-      1
+      0
     end
 
     def to_a

obsws.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = Dir["README.md", "CHANGELOG.md", "LICENSE"]
   spec.homepage = "https://rubygems.org/gems/obsws"
   spec.license = "MIT"
+  spec.add_runtime_dependency "observer", "~> 0.1.1"
   spec.add_runtime_dependency "websocket-driver", "~> 0.7.5"
   spec.add_runtime_dependency "waitutil", "~> 0.2.1"
   spec.add_development_dependency "standard", "~> 1.30"