sleeproom 0.9.0.beta3 → 0.9.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3845e3c4fe71e788a6a58fdccdeafdf54df9a076970e603d255221f9a9eb485d
-  data.tar.gz: 5bb98e697e5b39f8d2a7c77e8b383dfcc68c76d342f9aa9a062cdb1908567bc4
+  metadata.gz: 1164a0ff4adcb7d05b1a089972e1d895a10a334eb0d42be870a13198efbeec65
+  data.tar.gz: a22e22bc58e4db57da69b233d81026f6449645a4755a93c2353cb40430ab3ad9
 SHA512:
-  metadata.gz: 10225f5c2f860a9c0862962f0e0e35ed8bd3ceb4d630d7cfc72dd98d388643dea785bab30448b2003c1019dbc3bcb708615ce63cd296fbff549c2d7c2a76d5d6
-  data.tar.gz: 638388a6ab62c5db454155bdf8d21aebd6f1fdd562ea0b807add10c4759008ab2f09e96f535990ca506ffa5ccfdbcccdde7509ef22434b94d660ee0d584322cd
+  metadata.gz: 2999e46c33eaf5eed3fe5687e7815f74fcf0b0b702a9fc25113f10234c4d8e2d54d4023d460e7fb54a1f84a02b266c3d3f27dfb823ec0e16a0db2292ae6e8dad
+  data.tar.gz: 284d500d464e090b83dc7d72a4e1ed1e6db3322095e60f93e079359a0c25a8cef12804b3c9eb3f3a0a7a6fd45aaf32dbd684b03284eacd3317cbb33df367e968

data/.gitignore

@@ -11,7 +11,5 @@
 # rspec failure tracking
 .rspec_status
 
-Gemfile.lock
-
 # config
 /config/base.yml

data/Gemfile.lock

@@ -0,0 +1,160 @@
+PATH
+  remote: .
+  specs:
+    sleeproom (0.9.0.pre1)
+      async (~> 1.26.0)
+      async-http-faraday (~> 0.9.0)
+      async-websocket (~> 0.15.0)
+      backports (~> 3.0)
+      colorize (~> 0.8.0)
+      configatron (~> 4.5.0)
+      falcon (~> 0.36.0)
+      roda (~> 3.33.0)
+      ruby-next-core (~> 0.9.0)
+      terminal-table (~> 1.8.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    ast (2.4.1)
+    async (1.26.2)
+      console (~> 1.0)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-container (0.16.6)
+      async (~> 1.0)
+      async-io (~> 1.26)
+    async-http (0.52.4)
+      async (~> 1.25)
+      async-io (~> 1.28)
+      async-pool (~> 0.2)
+      protocol-http (~> 0.20.0)
+      protocol-http1 (~> 0.13.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-cache (0.2.0)
+      async-http (~> 0.51)
+    async-http-faraday (0.9.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.30.0)
+      async (~> 1.14)
+    async-pool (0.3.2)
+      async (~> 1.25)
+    async-websocket (0.15.0)
+      async-http (~> 0.51)
+      async-io (~> 1.23)
+      protocol-websocket (~> 0.7.0)
+    backports (3.18.1)
+    build-environment (1.13.0)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.6)
+    configatron (4.5.1)
+    console (1.8.2)
+    diff-lcs (1.3)
+    falcon (0.36.4)
+      async (~> 1.13)
+      async-container (~> 0.16.0)
+      async-http (~> 0.52.0)
+      async-http-cache (~> 0.2.0)
+      async-io (~> 1.22)
+      build-environment (~> 1.13)
+      localhost (~> 1.1)
+      process-metrics (~> 0.2.0)
+      rack (>= 1.0)
+      samovar (~> 2.1)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    localhost (1.1.6)
+    mapping (1.1.1)
+    minitest (5.14.1)
+    multipart-post (2.1.1)
+    nio4r (2.5.2)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    process-metrics (0.2.1)
+      console (~> 1.8)
+      samovar (~> 2.1)
+    protocol-hpack (1.4.2)
+    protocol-http (0.20.0)
+    protocol-http1 (0.13.0)
+      protocol-http (~> 0.19)
+    protocol-http2 (0.14.0)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    protocol-websocket (0.7.4)
+      protocol-http (~> 0.2)
+      protocol-http1 (~> 0.2)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rexml (3.2.4)
+    roda (3.33.0)
+      rack
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-github (0.16.0)
+      rubocop (<= 0.82.0)
+      rubocop-performance (~> 1.0)
+      rubocop-rails (~> 2.0)
+    rubocop-performance (1.6.1)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.82.0)
+    ruby-next-core (0.9.2)
+    ruby-progressbar (1.10.1)
+    samovar (2.1.4)
+      console (~> 1.0)
+      mapping (~> 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    timers (4.3.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop-github
+  rubocop-performance
+  sleeproom!
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -16,6 +16,7 @@
 ## TODO
 * [ ] 代理支持
 * [ ] Web GUI
+* [ ] 日志保存
 
 ## Service example
 ```

data/lib/sleeproom/cli.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "backports/2.5" if RUBY_VERSION < "2.5.0"
 require "ruby-next"
 require "optparse"
 require "yaml"
@@ -11,12 +12,6 @@ module SleepRoom
     def initialize(argv)
       SleepRoom.reload_config
       @options = {}
-      begin
-        minyami = `minyami --version`
-        status = $?
-      rescue => e
-        SleepRoom.warning("无法调用 Minyami: #{e.message}")
-      end
       build
       if argv.empty? == false
         @parser.parse!(argv)
@@ -47,18 +42,18 @@ module SleepRoom
         opt.banner += "status".rjust(10)
         opt.banner += "显示任务状态".rjust(33)
         opt.banner += "\n"
-        opt.banner += "lists".rjust(9)
-        opt.banner += "显示录制列表".rjust(34)
+        opt.banner += "list".rjust(8)
+        opt.banner += "显示录制列表".rjust(35)
         opt.banner += "\n"
         opt.banner += "exit".rjust(8)
         opt.banner += "关闭任务队列".rjust(35)
         opt.banner += "\n\nCommands:\n"
 
-        opt.on("-a ROOM, NAME", "--add ROOM, GROUP", Array, "添加房间到监视列表") do |room|
+        opt.on("-a ROOM, NAME", "--add ROOM, GROUP", Array, "添加到监视列表") do |room|
           SleepRoom::Record::Tasks.add(room[0].to_s, room[1].to_s)
         end
 
-        opt.on("-r", "--remove [ROOM]", "从监视列表移除房间") do |room|
+        opt.on("-r", "--remove [ROOM]", "从监视列表移除") do |room|
           SleepRoom::Record::Tasks.remove(room)
         end
 
@@ -73,12 +68,11 @@ module SleepRoom
           end
         end
 
-        opt.on("--verbose", "DEBUG") do
-          ENV["SR_DEBUG"] = "DEBUG"
+        opt.on("-v", "--verbose", "Print log") do
           @options[:verbose] = true
         end
 
-        opt.on_tail("-v", "--version", "Print version") do
+        opt.on_tail("--version", "Print version") do
           STDOUT.puts(opt.version)
         end
 

data/lib/sleeproom/record/record.rb

@@ -15,24 +15,21 @@ module SleepRoom
         @group = group
         @status = queue
         @running = false
-        @downloading = false
-        set_room_info
       end
 
       # Record Room
-      def record
+      def recore
+        set_room_info
         if @is_live
           log("Status: broadcast.")
-          download_process if @downloading == false
+          download_process
         else
-          update_status
           log("Status: Stop.")
         end
         start_websocket
       rescue => e
         error(e.full_message)
         Async::Task.current.sleep 5
-        set_room_info
         retry
       end
 
@@ -42,10 +39,6 @@ module SleepRoom
         SleepRoom.info("[#{@room}] #{str}")
       end
 
-      def debug(str)
-        SleepRoom.debug("[#{@room}] #{str}")
-      end
-
       # Print log
       # @param str [String]
       def error(str)
@@ -54,54 +47,47 @@ module SleepRoom
 
       private
 
-      def open_handler
-      end
-
-      def message_handler(data)
-        case data["t"].to_i
-        when 101
-          log("Live stop.")
-          @is_live = false
-          set_room_info
-        when 104
-          log("Live start.")
-          download_process
-        end
-      end
-
-      def close_handler(error)
-        @running = false
-      end
-
-      def error_handler(error)
-        @running = false
-      end
-
-      def ping_handler
-      end
-
       # Websocket connect
       def start_websocket(task: Async::Task.current)
-        connection = task.async do |task|
-          while @running == false
-            log("Broadcast Key: #{@broadcast_key}")
-            @ws = WebSocket.new(
-              room: @room, 
-              broadcast_key: @broadcast_key,
-              url: @broadcast_host,
-              open_handler: method(:open_handler),
-              message_handler: method(:message_handler),
-              close_handler: method(:close_handler),
-              error_handler: method(:error_handler),
-              ping_handler: method(:ping_handler)
-            )
-            @ws.connect
+        log("Broadcast Key: #{@broadcast_key}")
+        ws = WebSocket.new(room: @room, broadcast_key: @broadcast_key, url: @broadcast_host)
+        @running = true
+        update_status
+        begin
+          ws.connect do |event, message|
+            if event == :websocket
+              case message["t"].to_i
+              when 101
+                log("Live stop.")
+                @is_live = false
+                ws.running = false
+              when 104
+                log("Live start.")
+                download_process
+              end
+            elsif event == :status
+              case message[:event]
+              when :ack
+                update_status
+              when :close
+                log("WebSocket Close.")
+                task.sleep 5
+                record
+              when :error
+                error("Network Error.")
+                log("Try to reconnect server.")
+                task.sleep 5
+                record
+              end
+            else
+              # TODO
+            end
           end
+        rescue => e
+          error("WebSocket stopped.")
+          puts(e.full_message)
         end
-        task.children.each(&:wait)
       ensure
-        log("Websocket task stop.")
-        connection&.stop
         @running = false
       end
 
@@ -118,33 +104,31 @@ module SleepRoom
         task.stop
       rescue => e
         error(e.message)
-        log("Cannot parse room info.")
-        log("try again...")
+        log("获取房间信息失败.")
+        log("等待5秒...")
         task.sleep 5
         retry
       end
 
-      def parse_streaming_url(task: Async::Task.current)
+      def parse_streaming_url
         api = API::StreamingAPI.new(@room_id)
         api.streaming_url
       rescue => e
         SleepRoom.error(e.full_message)
-        log("Unable to parse HLS url.")
-        task.sleep 1
+        log("获取 HLS 地址失败.")
         retry
       end
 
       # Downloader
       def download_process(task: Async::Task.current)
         completed = false
-        @downloading = true
         log("Download start.")
         streaming_url = parse_streaming_url
         output = build_output
         # Call time
         call_time = Time.now
         pid = SleepRoom::Record.call_minyami(url: streaming_url, output: output)
-        @status.downloading(room: @room, url: streaming_url, pid: pid, start_time: call_time, output: output)
+        @status.downloading(room: @room, url: streaming_url, pid: pid, start_time: call_time)
         log("Waiting for download process.")
         # Status
         task.async do |t|
@@ -159,7 +143,7 @@ module SleepRoom
                 break if @is_live == true
 
                 log("Waiting for latest status...")
-                task.sleep 5
+                task.sleep 20
                 retries += 1
               end
               completed = true if retries == 3 && @is_live == false
@@ -167,20 +151,18 @@ module SleepRoom
               # Live stopped, Minyami process stopped.
               @status.add(room: @room, status: :completed, live: false)
               log("Download completed.")
-              if configatron.minyami.no_merge
-                log("Find minyami temp files...")
-                tmp_path = SleepRoom.find_tmp_directory(output, call_time)
-                if tmp_path
-                  log("Temp files in #{tmp_path}.")
-                  save_path = File.dirname("#{configatron.save_path}/#{output}")
-                  dir_name = File.basename(output).sub(".ts", "")
-                  SleepRoom.move_ts_to_archive(tmp_path, save_path, dir_name)
-                  log("Save chunks to #{save_path}/#{dir_name}.")
-                else
-                  log("Can not find temp file")
-                end
+              log("Find minyami temp files...")
+              tmp_path = SleepRoom.find_tmp_directory(output, call_time)
+              if tmp_path
+                log("Temp files in #{tmp_path}.")
+                save_path = File.dirname("#{configatron.save_path}/#{output}")
+                dir_name = File.basename(output).sub(".ts", "")
+                SleepRoom.move_ts_to_archive(tmp_path, save_path, dir_name)
+                log("Save chunks to #{save_path}/#{dir_name}.")
+              else
+                log("Can not find temp file")
               end
-              @ws.close
+              record
               @running = false
               break
             elsif SleepRoom.running?(pid) == false && @is_live == true
@@ -194,8 +176,6 @@ module SleepRoom
             t.sleep 1
           end
         end
-      ensure
-        @downloading = false
       end
 
       # @return [String]
@@ -209,7 +189,7 @@ module SleepRoom
       end
 
       def update_status
-        @status.waiting(room: @room, group: @group, room_name: @room_name, key: @broadcast_key)
+        @status.waiting(room: @room, group: @group, room_name: @room_name)
       end
     end
   end

data/lib/sleeproom/record/tasks.rb

@@ -35,6 +35,14 @@ module SleepRoom
               end
             end
             SleepRoom.info("共启动 #{running_task_count} 个任务.")
+            if configatron.web.use
+              Async do
+                host = configatron.web.server.to_s
+                port = configatron.web.port.to_i
+                Rack::Handler.get(:falcon).run(Web::App, Host: host, Port: port)
+                SleepRoom.info("Web server running. http://#{host}:#{port}/")
+              end
+            end
             task.children.each(&:wait)
           rescue StandardError => e
             puts e.full_message
@@ -97,13 +105,7 @@ module SleepRoom
 
       def self.add(room, group)
         Async do
-          if group.empty?
-            if group_match = room.match(/(?<=[(（]).*?(?=[)）])/)
-              group = group_match[0]
-            else
-              group = "default"
-            end
-          end
+          group = "default" if group.empty?
           old_record = SleepRoom.load_config(:record)
           name = API::RoomAPI.new(room).room_name
           input_record = { "room" => room, "name" => name }

data/lib/sleeproom/record/web/app.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "roda"
+module SleepRoom
+  module Web
+    class App < Roda
+      plugin :default_headers,
+             "Content-Type" => "application/json",
+             "X-Frame-Options" => "deny",
+             "X-Content-Type-Options" => "nosniff",
+             "X-XSS-Protection" => "1; mode=block"
+      plugin :content_security_policy do |csp|
+        csp.default_src :none
+        csp.style_src :self
+        csp.form_action :self
+        csp.script_src :self
+        csp.connect_src :self
+        csp.base_uri :none
+        csp.frame_ancestors :none
+      end
+      plugin :public
+      plugin :multi_route
+      plugin :not_found do
+      end
+      plugin :error_handler do |e|
+        $stderr.print "#{e.class}: #{e.message}\n"
+        warn e.backtrace
+        next exception_page(e, assets: true) if ENV["RACK_ENV"] == "development"
+      end
+
+      route "status" do |r|
+        SleepRoom.load_status.sort_by { |hash| hash[:group] }.to_json
+      end
+
+      route "lists" do |r|
+        r.get do
+          SleepRoom.load_config(:record).to_json
+        end
+
+        r.post do
+        end
+      end
+      route do |r|
+        r.public
+        r.multi_route
+
+        r.root do
+          "SleepRoom Web API"
+        end
+      end
+    end
+  end
+end

data/lib/sleeproom/record/websocket.rb

@@ -8,85 +8,94 @@ require "json"
 module SleepRoom
   module Record
     class WebSocket
-      def initialize(room:, broadcast_key:, url:, open_handler:, message_handler:, close_handler:, error_handler:, ping_handler:)
+      attr_accessor :last_ack
+      def initialize(room:, broadcast_key:, url:)
         @room = room
         @url = "wss://" + url
         @broadcast_key = broadcast_key
         @running = false
-        @endpoint = Async::HTTP::Endpoint.parse(@url)
-        @open_handler = open_handler
-        @message_handler = message_handler
-        @close_handler = close_handler
-        @error_handler = error_handler
-        @ping_handler = ping_handler
+        @last_ack = nil
       end
 
       def connect(task: Async::Task.current)
-        websocket = Async::WebSocket::Client.connect(@endpoint, handler: WebSocketConnection) do |connection|
-          @connection = connection
-          @running = true
-          send("SUB\t#{@broadcast_key}")
+        url = @url
+        endpoint = Async::HTTP::Endpoint.parse(url)
+        Async::WebSocket::Client.connect(endpoint, handler: WebSocketConnection) do |connection|
+          begin
+            @connection = connection
+            @running = true
+            connection.write("SUB\t#{@broadcast_key}")
+            connection.flush
+            log("Connect to websocket server.")
+            yield :status, { event: :connect, time: Time.now }
 
-          log("Connect to websocket server.")
-          @open_handler.call
-
-          ping = task.async do |task|
-            loop do
-              task.sleep 60
-              send("PING\tshowroom")
+            ping_task = task.async do |sub|
+              while @running
+                sub.sleep 60
+                connection.write("PING\tshowroom")
+                connection.flush
+              end
             end
-          end
 
-          while message = connection.read
-            debug("ACK: #{message}")
-            @ping_handler.call if message == "ACK\tshowroom"
+            status_task = task.async do |sub|
+              loop do
+                sub.sleep 1
+                connection.close if @running == false
+              end
+            end
 
-            next unless message.start_with?("MSG")
+            reconnect_task = task.async do |t|
+              loop do
+                t.sleep 10
+                if !@last_ack.nil? && Time.now.to_i - @last_ack.to_i > 65
+                  begin
+                    yield :status, { event: :close, time: Time.now }
+                    connection.close
+                  rescue
+                  end
+                end
+              end
+            end
+            while message = connection.read
+              if message == "ACK\tshowroom"
+                @last_ack = Time.now
+                yield :status, { event: :ack, time: Time.now } if message == "ACK\tshowroom"
+              end
+              next unless message.start_with?("MSG")
 
-            begin
-              @message_handler.call(JSON.parse(message.split("\t")[2]))
-            rescue JSON::ParserError => e
-              @error_handler.call(e)
-              log(e.message)
+              begin
+                yield :websocket, JSON.parse(message.split("\t")[2])
+              rescue => e
+                SleepRoom.error(e.message)
+              end
             end
+          rescue => e
+            yield :status, { event: :error, error: e }
+            SleepRoom.error(e.message)
+          ensure
+            ping_task&.stop
+            status_task&.stop
+            connection.close
+            reconnect_task&.stop
+            log("WebSocket closed.")
           end
-        rescue => e
-          error "error"
-          @error_handler.call(e)
-          log(e.full_message)
-        ensure
-          ping&.stop
-          @close_handler.call(nil)
-          @running = false
-          log("WebSocket closed.")
         end
       end
 
-      def send(data)
-        debug("SEND: #{data}")
-        @connection.write(data)
-        @connection.flush
-      end
-
       def running?
         @running
       end
 
+      attr_writer :running
+
       def stop
+        @running = false
         @connection.close
       end
 
       def log(str)
         SleepRoom.info("[#{@room}] #{str}")
       end
-
-      def error(str)
-        SleepRoom.error("[#{@room}] #{str}")
-      end
-
-      def debug(str)
-        SleepRoom.debug("[#{@room}] #{str}")
-      end
-    end
   end
-end
+  end
+end

data/lib/sleeproom/record/write_status.rb

@@ -34,7 +34,7 @@ module SleepRoom
         end
       end
 
-      def downloading(room:, url:, pid:, start_time:, output:)
+      def downloading(room:, url:, pid:, start_time:)
         add(
           {
             room: room,
@@ -47,7 +47,7 @@ module SleepRoom
         )
       end
 
-      def waiting(room:, group:, room_name:, key:)
+      def waiting(room:, group:, room_name:)
         add(
           {
             room: room,
@@ -55,9 +55,6 @@ module SleepRoom
             group: group,
             name: room_name,
             status: :waiting,
-            websocket: {
-              key: key
-            }
           }
         )
       end

data/lib/sleeproom/record.rb

@@ -8,20 +8,21 @@ require "sleeproom/record/record"
 require "sleeproom/record/tasks"
 require "sleeproom/record/websocket"
 require "sleeproom/record/api/api"
-require "sleeproom/record/plugins"
+require "sleeproom/record/web/app"
 require "async"
+require "roda"
+require "rack/handler/falcon"
 require "shellwords"
 module SleepRoom
   module Record
     # Okite!!!
     # @param url [String]
     # @return [Integer]
-    def self.call_minyami(url:, is_live: true, threads: configatron.minyami.threads, output:, retries: configatron.minyami.retries, no_merge: configatron.minyami.no_merge)
+    def self.call_minyami(url:, is_live: true, threads: configatron.minyami.threads, output:, retries: configatron.minyami.retries)
       command = "minyami -d #{Shellwords.escape(url)}"
       command += " --retries #{retries.to_i}" if retries
       command += " --threads #{threads.to_i}" if threads
       command += " --live" if is_live
-      command += " --nomerge" if no_merge
       output = File.join(configatron.save_path, output)
       command += " --output #{Shellwords.escape(output)}" if output
       download_dir_check(output)

data/lib/sleeproom/utils.rb

@@ -6,14 +6,9 @@ require "fileutils"
 require "tmpdir"
 require "yaml"
 require "logger"
-require "dry/files"
 
 module SleepRoom
   class Error < StandardError; end
-  def self.files
-    Dry::Files.new
-  end
-  
   # @return [String]
   def self.root_path
     Dir.pwd
@@ -90,10 +85,15 @@ module SleepRoom
 
   def self.init_base
     base = {
+      web: {
+        use: true,
+        server: "localhost",
+        port: 3000
+      },
       proxy: {
         use: false,
         server: "localhost",
-        port: 1080,
+        port: 8080,
         type: "socks5"
       },
       record: {
@@ -107,8 +107,7 @@ module SleepRoom
       default_save_name: "%ROOMNAME%-%TIME%.ts",
       minyami: {
         threads: 8,
-        retries: 999,
-        no_merge: false,
+        retries: 999
       },
       logger: {
         console: true,
@@ -196,10 +195,6 @@ module SleepRoom
     SleepRoom.write_config_file(:pid, pid)
   end
   
-  def self.plugins
-    
-  end
-
   def self.find_tmp_directory(output, call_time)
     regex = /Proccessing (.*) finished./
     output = "#{configatron.save_path}/#{output}"
@@ -234,12 +229,6 @@ module SleepRoom
     log(:info, string)
   end
 
-  # @param string [String]
-  # @return [nil]
-  def self.debug(string)
-    log(:debug, string) if ENV["SR_DEBUG"]
-  end
-
   # @param string [String]
   # @return [nil]
   def self.warning(string)
@@ -261,8 +250,6 @@ module SleepRoom
         warn("[WARN] #{log}".colorize(:yellow))
       when :error
         puts("[ERROR] #{log}".colorize(:red))
-      when :debug
-        puts("[DEBUG] #{log}".colorize(:gray))
       end
     end
     file_logger(type, log) if configatron.logger.file.use == true

data/lib/sleeproom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SleepRoom
-  VERSION = "0.9.0.beta3"
+  VERSION = "0.9.0.pre1"
 end

data/sleeproom.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "sleeproom"
   spec.homepage      = "https://github.com/KoellM/sleeproom"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
@@ -25,15 +25,16 @@ Gem::Specification.new do |spec|
   spec.executables   = ["sleeproom"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("async", "~> 1.29")
-  spec.add_runtime_dependency("async-http-faraday", "~> 0.9")
-  spec.add_runtime_dependency("async-websocket", "~> 0.18")
-  spec.add_runtime_dependency("colorize", "~> 0.8")
-  spec.add_runtime_dependency("configatron", "~> 4.5")
-  spec.add_runtime_dependency("ruby-next-core", "~> 0.9")
-  spec.add_runtime_dependency("terminal-table", "~> 1.8")
-  spec.add_runtime_dependency("dry-files", "~> 0.1")
-  spec.add_runtime_dependency("dry-auto_inject", "~> 0.6")
+  spec.add_runtime_dependency("async", "~> 1.26.0")
+  spec.add_runtime_dependency("async-http-faraday", "~> 0.9.0")
+  spec.add_runtime_dependency("async-websocket", "~> 0.15.0")
+  spec.add_runtime_dependency("backports", "~> 3.0")
+  spec.add_runtime_dependency("colorize", "~> 0.8.0")
+  spec.add_runtime_dependency("configatron", "~> 4.5.0")
+  spec.add_runtime_dependency("falcon", "~> 0.36.0")
+  spec.add_runtime_dependency("roda", "~> 3.33.0")
+  spec.add_runtime_dependency("ruby-next-core", "~> 0.9.0")
+  spec.add_runtime_dependency("terminal-table", "~> 1.8.0")
   
   spec.post_install_message = <<~STR
     SleepRoom 需要:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleeproom
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta3
+  version: 0.9.0.pre1
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,126 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: async-http-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: configatron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
-  name: ruby-next-core
+  name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 3.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 3.33.0
 - !ruby/object:Gem::Dependency
-  name: dry-files
+  name: ruby-next-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: dry-auto_inject
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.8.0
 description: 
 email:
 - i@wug.moe
@@ -149,6 +163,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -160,10 +175,9 @@ files:
 - lib/sleeproom/record/api/room.rb
 - lib/sleeproom/record/api/room_api.rb
 - lib/sleeproom/record/api/streaming_api.rb
-- lib/sleeproom/record/plugins.rb
-- lib/sleeproom/record/plugins/youtube/upload.rb
 - lib/sleeproom/record/record.rb
 - lib/sleeproom/record/tasks.rb
+- lib/sleeproom/record/web/app.rb
 - lib/sleeproom/record/websocket.rb
 - lib/sleeproom/record/write_status.rb
 - lib/sleeproom/utils.rb
@@ -186,14 +200,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: sleeproom

data/lib/sleeproom/record/plugins/youtube/upload.rb

@@ -1 +0,0 @@
-# Youtube Uploader

data/lib/sleeproom/record/plugins.rb

@@ -1,9 +0,0 @@
-require 'dry/system/container'
-
-module SleepRoom
-  module Record
-    class Plugins
-      extend Dry::Container::Mixin
-    end
-  end
-end