server status

Author: maca

lib/scruby/graph/print.rb

@@ -3,12 +3,16 @@ class Graph
     module Print
       class << self
         def print(root)
-          puts print_node(root, [], "", nil)
+          puts visualize(root)
+        end
+
+        def visualize(root)
+          visualize_node(root, [], "", nil)
         end
 
         protected
 
-        def print_node(node, siblings, padding, param_name)
+        def visualize_node(node, siblings, padding, param_name)
           is_last = node.eql? siblings.last
 
           # TODO: refactor
@@ -41,7 +45,7 @@ def print_node(node, siblings, padding, param_name)
             ("\n" if inputs.any?),
 
             inputs.zip(param_names).map { |i, name|
-              print_node(i, inputs, child_padding, name)
+              visualize_node(i, inputs, child_padding, name)
             },
 
             ("\n" unless is_last)

lib/scruby/server.rb

@@ -6,6 +6,8 @@
 module Scruby
   class Server
     class ServerError < StandardError; end
+    class ClientInfo < Struct.new(:id, :max_logins); end
+
     extend Forwardable
 
     include OSC
@@ -14,36 +16,31 @@ class ServerError < StandardError; end
     include Encode
     include Concurrent
 
-    attr_reader :client, :message_queue, :process, :options
+    attr_reader :osc_client, :message_queue, :process, :options,
+                :client_info
     private :message_queue, :process
 
     def_delegators :options, :host, :port, :num_buffers
 
 
     def initialize(host: "127.0.0.1", port: 57_110, **options)
-      @client = OSC::Client.new(port, host)
+      @osc_client = OSC::Client.new(port, host)
       @message_queue = MessageQueue.new(self)
       @options = Options.new(**options, bind_address: host, port: port)
       @nodes = Nodes.new(self)
-
-      listen_node_changes
     end
 
     def alive?
-      message_queue.alive?
+      process_alive?
     end
     alias running? alive?
 
-    def process_alive?
-      process&.alive? || false
-    end
-
     def client_id
-      @client_id ||= register_client.first
+      client_info&.id
     end
 
     def max_logins
-      @max_logins ||= register_client.last
+      client_info&.max_logins
     end
 
     def nodes
@@ -71,15 +68,15 @@ def boot(binary: "scsynth", **opts)
     end
 
     def boot_async(binary: "scsynth", **opts)
-      return message_queue.sync.then { self } if process_alive?
+      return sync.then { self } if process_alive?
 
       @options = Options.new(**options, **opts)
       @num_buffers = options.num_buffers
       @process = Process.spawn(binary, options.flags, env: options.env)
 
       wait_for_booted
         .then_flat_future { message_queue.sync }
-        .then { register_client }
+        .then_flat_future { register_client }
         .then { create_root_group }
         .then { self }
         .on_rejection { process.kill }
@@ -91,13 +88,13 @@ def quit
     alias stop quit
 
     def quit_async
-      return Promises.fulfilled_future(self) unless alive?
-
+      # return Promises.fulfilled_future(self) unless alive?
       send_msg("/quit")
 
       receive { |msg| msg.to_a == %w(/done /quit) }
         .then { sleep 0.1 while process_alive? }
-        .then { message_queue.stop }
+        .then { message_queue.flush }
+        .then { @client_info = nil }
         .then { self }
     end
     alias stop_async quit_async
@@ -125,7 +122,17 @@ def free_all
     # end
 
     def status
-      message_queue.status.value!
+      status_async.value!
+    end
+
+    def status_async
+      keys = %i(ugens synths groups synth_defs avg_cpu peak_cpu
+          sample_rate actual_sample_rate)
+
+      send_msg Message.new("/status")
+
+      receive("/status.reply", timeout: 0.2)
+        .then { |msg| keys.zip(msg.args[1..-1]).to_h }
     end
 
     # Sends an OSC command or +Message+ to the scsyth server.
@@ -143,9 +150,9 @@ def send_msg(message, *args)
 
       case message
       when Message, Bundle
-        client.send(message)
+        osc_client.send(message)
       else
-        client.send Message.new(message, *args)
+        osc_client.send Message.new(message, *args)
       end
 
       self
@@ -184,8 +191,20 @@ def dump_osc(code = 1)
       send_msg("/dumpOSC", code)
     end
 
+    def socket
+      osc_client.instance_variable_get(:@socket)
+    end
+
     private
 
+    def process_alive?
+      process&.alive? || false
+    end
+
+    def sync
+      message_queue.sync
+    end
+
     def update_nodes
       send_msg("/g_queryTree", 0, 1)
 
@@ -227,9 +246,10 @@ def register_client
       send_msg("/notify", 1, 0)
 
       receive("/done")
-        .then { |m| @client_id, @max_logins = m.args.slice(1, 2) }
+        .then { |m| m.args.slice(1, 2) }
         .then { |a| a.each { |v| raise ServerError, v if String === v } }
-        .value!
+        .then { |args| @client_info = ClientInfo.new(*args) }
+        .then { listen_node_changes }
     end
 
     def graph_completion_blob(message)

lib/scruby/server/message_queue.rb

@@ -37,15 +37,6 @@ def sync
         end
       end
 
-      def status
-        keys = %i(ugens synths groups synth_defs avg_cpu peak_cpu
-          sample_rate actual_sample_rate)
-
-        server.send_msg Message.new("/status")
-        receive("/status.reply", timeout: 0.2)
-          .then { |msg| keys.zip(msg.args[1..-1]).to_h }
-      end
-
       def run
         return thread if alive?
 
@@ -59,16 +50,10 @@ def alive?
       end
       alias running? alive?
 
-      def stop
-        return self unless alive?
-
-        thread.kill
-
+      def flush
         patterns.delete_if do |_, _, future|
           future.reject CancelledOperationError.new("server quitted")
         end
-
-        self
       end
 
       private
@@ -97,7 +82,7 @@ def dispatch_msg(message)
       end
 
       def socket
-        server.client.instance_variable_get(:@socket)
+        server.socket
       end
 
       def cancellation_future(timeout)

lib/scruby/server/nodes.rb

@@ -43,12 +43,8 @@ def node(idx)
         synchronize { graph[idx] }
       end
 
-      def print
-        first.print
-      end
-
       def inspect
-        print
+        first.visualize
       end
 
       private

lib/scruby/server_node.rb

@@ -94,12 +94,6 @@ def fill
     def running?
     end
 
-    def register
-    end
-
-    def unregister
-    end
-
     def create(*args)
       send_msg(creation_cmd, *args)
     end
@@ -112,8 +106,8 @@ def print_name
       "#{self.class.name.split('::').last} #{id}"
     end
 
-    def print
-      Graph::Print.print(self)
+    def visualize
+      Graph::Print.visualize(self)
     end
 
     private

spec/integration/operation_graph_spec.rb

@@ -1,16 +1,18 @@
 RSpec.describe UgenGraph do
+  let(:server) { Server.new }
+
+  before do
+    allow(server).to receive(:send_msg)
+  end
+
   describe "graph with float mult" do
-    let(:server) { Server.new }
     let(:graph) { UgenGraph.new(Out.ar(0, SinOsc.ar * 0.5), "mult") }
 
     it { expect(graph.nodes.map(&:name))
            .to eq %w(SinOsc BinaryOpUGen Out) }
 
     it { expect(graph.constants.map(&:value)).to eq [ 440, 0, 0.5 ] }
 
-    # fBinaryOpUGen\x02\x00\x00\x00\x02\x00\x00\x00\x01\x00\x02
-    # fBinaryOpUGen\x02\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00
-
     let(:expected) do
       [ 83, 67, 103, 102, 0, 0, 0, 2, 0, 1, 4, 109, 117, 108, 116, 0,
         0, 0, 3, 67, -36, 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0,
@@ -29,6 +31,7 @@
 
     it "sends graph" do
       expect(graph.send_to(server)).to eq(graph)
+      expect(graph.send_to(server)).to eq(graph)
     end
   end