obsws 0.5.2 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516727ae86bc3f1f6eaa13a6bc4434bbed7fdeaebd1d5311ba52b40de1a292f0
-  data.tar.gz: 1d42563cfd5d224a1e0f6bad9cbc306222105b098cedb46a062b20544d409104
+  metadata.gz: 0e1082183fb2605b7ca64747dcd88930516b4132b02f142afa7bb6db58e62120
+  data.tar.gz: 752365a78828d329a6d765a8920398efdf09a426122cc0e7b0380c8db27f9d5a
 SHA512:
-  metadata.gz: a320d897a324f6f90c7fca50f27dee4f3fcf62121e14c2787f144e8b90a3a1e7732b82e6a54571b427bc61dd0eb43cde47da8ff5e3dd31068dc25468063055fe
-  data.tar.gz: '08886350eb47e6689d60dd5afe6dffe0bb69709f6b3b2ad95cd2b98a85c5e3f2948cfdcc7cb63582f710afcaaa1bb9a24980f4091460f8e76bbd37507fa196a6'
+  metadata.gz: 812133a0bf0019e5cf59c6bcae577c256b862bc497df97f2f1265e88b0c6616277b2afa44f376ae932137b2baac499cca0acf4dbf5d139e15baac268fc629818
+  data.tar.gz: a7ff0fe86ac3d988beee0d6ff2d31fd3b8e235b189afe9265e65d190bbb10953e85e7106578190fd4ece5e4e171d13ecf0aeefb16bd16d719ac203da62449799

data/README.md

@@ -30,13 +30,17 @@ Pass `host`, `port` and `password` as keyword arguments.
 require "obsws"
 
 class Main
+  INPUT = "Mic/Aux"
+
   def run
     OBSWS::Requests::Client
       .new(host: "localhost", port: 4455, password: "strongpassword")
       .run do |client|
-        # Toggle the mute state of your Mic input
-        client.toggle_input_mute("Mic/Aux")
-      end
+      # Toggle the mute state of your Mic input and print its new mute state
+      client.toggle_input_mute(INPUT)
+      resp = client.get_input_mute(INPUT)
+      puts "Input '#{INPUT}' was set to #{resp.input_muted}"
+    end
   end
 end
 

data/lib/obsws/base.rb

@@ -16,7 +16,7 @@ module OBSWS
       WaitUtil.wait_for_condition(
         "successful identification",
         delay_sec: 0.01,
-        timeout_sec: 3
+        timeout_sec: kwargs[:connect_timeout] || 3
       ) { @identified }
     end
 

data/lib/obsws/req.rb

@@ -9,9 +9,8 @@ module OBSWS
         @base_client = Base.new(**kwargs)
         logger.info("#{self} successfully identified with server")
       rescue Errno::ECONNREFUSED, WaitUtil::TimeoutError => e
-        msg = "#{e.class.name}: #{e.message}"
-        logger.error(msg)
-        raise OBSWSConnectionError.new(msg)
+        logger.error("#{e.class.name}: #{e.message}")
+        raise OBSWSConnectionError.new(e.message)
       else
         @base_client.updater = ->(op_code, data) {
           logger.debug("response received: #{data}")
@@ -36,31 +35,22 @@ module OBSWS
       end
 
       def call(req, data = nil)
-        id = rand(1..1000)
-        @base_client.req(id, req, data)
+        uuid = SecureRandom.uuid
+        @base_client.req(uuid, req, data)
         WaitUtil.wait_for_condition(
           "reponse id to match request id",
           delay_sec: 0.001,
           timeout_sec: 3
-        ) { @response[:requestId] == id }
+        ) { @response[:requestId] == uuid }
         unless @response[:requestStatus][:result]
-          raise OBSWSRequestError.new(@response[:requestType], @response[:requestStatus][:code], @response[:requestStatus][:comment])
+          OBSWSRequestError.new(@response[:requestType], @response[:requestStatus][:code], @response[:requestStatus][:comment]) => e
+          logger.error(["#{e.class.name}: #{e.message}", *e.backtrace].join("\n"))
+          raise e
         end
         @response[:responseData]
-      rescue OBSWSRequestError => e
-        err_msg = [
-          "#{e.class.name}: #{e.message}",
-          *e.backtrace
-        ]
-        logger.error(err_msg.join("\n"))
-        raise
       rescue WaitUtil::TimeoutError => e
-        err_msg = [
-          "#{e.class.name}: #{e.message}",
-          *e.backtrace
-        ]
-        logger.error(err_msg)
-        raise OBSWSError.new(err_msg)
+        logger.error(["#{e.class.name}: #{e.message}", *e.backtrace].join("\n"))
+        raise OBSWSError.new([e.message, *e.backtrace].join("\n"))
       end
 
       def get_version

data/lib/obsws/version.rb

@@ -11,7 +11,7 @@ module OBSWS
     end
 
     def patch
-      2
+      6
     end
 
     def to_a

data/lib/obsws.rb

@@ -1,9 +1,10 @@
 require "digest/sha2"
 require "json"
-require "waitutil"
+require "logger"
+require "securerandom"
 require "socket"
+require "waitutil"
 require "websocket/driver"
-require "logger"
 
 require_relative "obsws/logger"
 require_relative "obsws/driver"
@@ -33,7 +34,7 @@ module OBSWS
 
     def message
       msg = [
-        "Request #{@name} returned code #{@code}."
+        "Request #{@req_name} returned code #{@code}."
       ]
       msg << "With message: #{@msg}" if @msg
       msg.join(" ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obsws
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.6
 platform: ruby
 authors:
 - onyx_online