sleeproom 0.1.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0154be3d205feeac7e626a12dce7c76e54253c9731d926e35aab1478e046f5f5
-  data.tar.gz: 93ed191055cbe4af6c73890bb50daadef4296857ba1f90f2b924547aefbfa92d
+  metadata.gz: 8e8ca3fc07a7a4dc3ed69aec76ad0d267bcaa60a9b4ef5c0adea7d068fe2c592
+  data.tar.gz: 78b13ce764ae80d0b48d9ca5fa59c8bfe929572b90f3baa248d8412068ff606d
 SHA512:
-  metadata.gz: d9d8f2c0ddb0cad2c30c8bb9c3f9719eb9585c1895b0e114f97f11d534c52372925225a9b61dfbb89be05605e6e6637e801ba547417626dfde035b1b7ea94620
-  data.tar.gz: 5d1b0e70df00ae7e069f9af9a41c751445d8a9ab24f0223f573ab7e8e61064eb2ab82a91193ebf65c0e94face9e906254928b85335bd72ca6b37621fd2281a76
+  metadata.gz: 69ebf1096e11fe91773de30d73b2c6801a851e85680bbcf5e94839a9e546f0268528bea9f7940862c882eda2da838c5485f957fbabe03fa57ca718b9e1c324b1
+  data.tar.gz: 076171c25ac3a74bcde2104f7db59e3cfbd549319a820a35e689eaee267f539fa6c17d104510b9a6c364c6d3dbca0bae83fff13bd5008a5a9f4915ab88cf05c5

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.1.1)
-      async
-      async-http-faraday
-      async-websocket
-      colorize
-      configatron
-      terminal-table
+    sleeproom (0.4.1)
+      async (~> 1.26.0)
+      async-http-faraday (~> 0.9.0)
+      async-websocket (~> 0.15.0)
+      colorize (~> 0.8.0)
+      configatron (~> 4.5.0)
+      terminal-table (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/

data/bin/sleeproom

@@ -1,6 +1,7 @@
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require "sleeproom/cli"
 
 cli = SleepRoom::CLI.new(ARGV)
-cli.run
+cli.run

data/lib/sleeproom/cli.rb

@@ -8,6 +8,7 @@ module SleepRoom
   class CLI
     # @param argv [Array]
     def initialize(argv)
+      SleepRoom.reload_config
       @options = {}
       build
       unless argv.empty?
@@ -17,8 +18,6 @@ module SleepRoom
           SleepRoom::Record::Tasks.status
         elsif action == "start"
           SleepRoom::Record::Tasks.start
-        elsif action == "download"
-          raise "未实现"
         elsif action == "exit"
           SleepRoom::Record::Tasks.stop
         end
@@ -53,18 +52,24 @@ module SleepRoom
           SleepRoom::Record::Tasks.add(room[0].to_s, room[1].to_s)
         end
 
-        opt.on("-r", "--remove [URL]", "从监视列表移除") do |room|
+        opt.on("-r", "--remove [ROOM]", "从监视列表移除") do |room|
           SleepRoom::Record::Tasks.remove(room)
         end
 
-        opt.on("-v", "--verbose", "Print log") do
-          @options[:verbose] = true
+        opt.on("-d", "--download [ROOM]", "录制指定房间") do |room|
+          raise Error.new("房间名不能为空") if room.nil?
+          if room.match?("https://www.showroom-live.com/")
+            room = room.match(/https:\/\/www.showroom-live.com\/(.*)/)[1]
+          end
+          write_status = SleepRoom::Record::WriteStatus.new
+          record = SleepRoom::Record::Showroom.new(room: room, group: "download", queue: write_status)
+          record.record
         end
 
-        opt.on("-d", "daemon", "Daemonize the script into the background") do
-          @options[:daemon] = true
+        opt.on("-v", "--verbose", "Print log") do
+          @options[:verbose] = true
         end
-
+        
         opt.on_tail("--version", "Print version") do
           STDOUT.puts(opt.version)
         end

data/lib/sleeproom/record/api/api.rb

@@ -10,6 +10,7 @@ module SleepRoom
   module Record
     module API
       class Error < StandardError; end
+      class NotFoundError < Error; end
       ROOM_URL = "https://www.showroom-live.com"
       ROOM_API = "https://www.showroom-live.com/api/room/status"
       STREAMING_API = "https://www.showroom-live.com/api/live/streaming_url"
@@ -21,6 +22,8 @@ module SleepRoom
           http = Faraday.get(url, nil, {"User-Agent": USER_AGENT})
           if http.status == 200
             @json = JSON.parse(http.body)
+          elsif http.status == 404
+            raise NotFoundError
           else
             raise Error, "HTTP Error: #{http.status}"
           end

data/lib/sleeproom/record/api/streaming_api.rb

@@ -15,7 +15,11 @@ module SleepRoom
         end
 
         def streaming_url
-          @json["streaming_url_list"].sort_by{|hash| -hash["quality"]}.first["url"]
+          if @json["streaming_url_list"].nil?
+            raise Error.new("streaming url is null.")
+          else
+            @json["streaming_url_list"].sort_by{|hash| -hash["quality"]}.first["url"]
+          end
         end
       end
     end

data/lib/sleeproom/record/record.rb

@@ -19,12 +19,12 @@ module SleepRoom
       def record(reconnection: false)
         room = @room
         Async do |task|
-          api = API::RoomAPI.new(room)
+          set_room_info
           task.async do |t|
-            while api.live?
+            while @is_live
               if status = SleepRoom.load_config(:status).find{|hash| hash[:room] == room}
                 if !status[:pid].nil?
-                  break if SleepRoom.running?(pid) == false
+                  break if SleepRoom.running?(status[:pid]) == false
                 else
                   break
                 end
@@ -34,11 +34,6 @@ module SleepRoom
               t.sleep 60
             end
           end.wait
-          @room_id = api.room_id
-          @room_name = api.room_name
-          @is_live = api.live?
-          @broadcast_host = api.broadcast_host
-          @broadcast_key = api.broadcast_key
           if @is_live
             start_time = Time.now
             log("Live broadcast.")
@@ -55,12 +50,7 @@ module SleepRoom
                 if @running == false && @reconnection == false
                   start_websocket
                 elsif @reconnection == true
-                  api = API::RoomAPI.new(room)
-                  @room_id = api.room_id
-                  @room_name = api.room_name
-                  @is_live = api.live?
-                  @broadcast_host = api.broadcast_host
-                  @broadcast_key = api.broadcast_key
+                  set_room_info
                   start_websocket
                   @reconnection = false
                 end
@@ -122,15 +112,27 @@ module SleepRoom
           end
 
           Async do |task|
+            last_ack = nil
+            last_ping = nil
             while @running && @downlaoding == false
-              status = ws.status
-              if !status[:last_ack].nil? && Time.now.to_i - status[:last_ack].to_i > 65
+              queue = ws.queue.items
+              if !queue.empty?
+                queue.each do |event|
+                  case event[:event]
+                  when :ack
+                    last_ack = event[:time]
+                  when :ping
+                    last_ping = event[:ping]
+                  end
+                end
+              end
+              if !last_ack.nil? && Time.now.to_i - last_ack.to_i > 65
                 ws.running = false
                 @running = false
                 task.stop
               end
-              waiting_live(status)
-              task.sleep 30
+              waiting_live({last_ack: last_ack})
+              task.sleep 1
             end
           end
           task.children.each(&:wait)
@@ -139,10 +141,31 @@ module SleepRoom
           @running = false
         end
       end
+      
+      def set_room_info
+        api = API::RoomAPI.new(@room)
+        @room_id = api.room_id
+        @room_name = api.room_name
+        @is_live = api.live?
+        @broadcast_host = api.broadcast_host
+        @broadcast_key = api.broadcast_key
+      rescue API::NotFoundError
+        SleepRoom.error("[#{@room}] The room does not exist.")
+        log("Task stopped.")
+        Async::Task.current.stop
+      rescue => e
+        SleepRoom.error(e.message)
+        log("[setRoomInfo] Retry...")
+        retry
+      end
 
       def parse_streaming_url(task: Async::Task.current)
         api = API::StreamingAPI.new(@room_id)
         streaming_url_list = api.streaming_url
+      rescue => e
+        SleepRoom.error(e.full_message)
+        log("[parseStreamingUrl] Retry...")
+        retry
       end
 
       def build_output(task: Async::Task.current)
@@ -167,8 +190,9 @@ module SleepRoom
           download_pid: pid
         })
         task.async do |t|
-          while true
-            if !SleepRoom.running?(pid) && !API::RoomAPI.new(@room).live?
+          loop do
+            live = API::RoomAPI.new(@room).live?
+            if !SleepRoom.running?(pid) && !live
               log("Download complete.")
               @downlaoding = false
               @queue.add({
@@ -179,8 +203,18 @@ module SleepRoom
                 status: :complete,
               })
               break
+            elsif live && !SleepRoom.running?(pid)
+              log("Minyami crash.")
+              streaming_url = parse_streaming_url
+              output = build_output
+              pid = SleepRoom::Record.call_minyami(url: streaming_url, output: output)
+            elsif !live && SleepRoom.running?(pid)
+              log("Live stop.")
             end
-            t.sleep 60
+            t.sleep 120
+          rescue Faraday::ConnectionFailed
+            log("Network error.")
+            retry
           end
         end.wait
       end

data/lib/sleeproom/record/websocket.rb

@@ -6,12 +6,13 @@ require "json"
 module SleepRoom
     module Record
         class WebSocket
+          attr_accessor :queue
           def initialize(room:, broadcast_key:, url:)
             @room = room
             @url = "wss://" + url
             @broadcast_key = broadcast_key
             @running = false
-            @status = {}
+            @queue = Async::Queue.new
           end
 
           def connect(task: Async::Task.current)
@@ -23,12 +24,12 @@ module SleepRoom
                 connection.write("SUB\t#{@broadcast_key}")
                 connection.flush
                 log("Connect to websocket server.")
-                @status[:last_update] = Time.now
+                @queue.enqueue({event: :connect, time: Time.now})
                 
                 ping_task = task.async do |sub|
                   while @running
                     sub.sleep 60
-                    @status[:last_ping] = Time.now
+                    @queue.enqueue({event: :ping, time: Time.now})
                     connection.write("PING\tshowroom")
                     connection.flush
                   end
@@ -44,12 +45,10 @@ module SleepRoom
                 end
 
                 while message = connection.read
-                  @status[:last_update]
                   if message == "ACK\tshowroom"
-                    @status[:last_ack] = Time.now if message == "ACK\tshowroom"
+                    @queue.enqueue({event: :ack, time: Time.now}) if message == "ACK\tshowroom"
                   end
                   if message.start_with?("MSG")
-                    @status[:last_msg] = Time.now
                     begin
                       yield JSON.parse(message.split("\t")[2])
                     rescue => e
@@ -79,10 +78,6 @@ module SleepRoom
             @connection.close
           end
 
-          def status
-            @status
-          end
-
           def log(str)
             SleepRoom.info("[#{@room}] #{str}")
           end

data/lib/sleeproom/utils.rb

@@ -4,6 +4,7 @@ require "configatron"
 require "colorize"
 require "fileutils"
 require "yaml"
+require "logger"
 
 module SleepRoom
   class Error < StandardError; end
@@ -111,10 +112,6 @@ module SleepRoom
         file: {
           use: true,
           path: "#{sleeproom_dir}/log"
-        },
-        websocket: {
-          log: true,
-          ping_log: false
         }
       }
     }
@@ -197,18 +194,43 @@ module SleepRoom
   # @param string [String]
   # @return [nil]
   def self.info(string)
-    STDOUT.puts("[INFO] #{string}".colorize(:white))
+    log(:info, "[INFO] #{string}".colorize(:white))
   end
 
   # @param string [String]
   # @return [nil]
   def self.warning(string)
-    warn("[WARN] #{string}".colorize(:yellow))
+    log(:warning, "[WARN] #{string}".colorize(:yellow))
   end
 
   # @param string [String]
   # @return [nil]
   def self.error(string)
-    STDOUT.puts("[ERROR] #{string}".colorize(:red))
+    log(:error, "[ERROR] #{string}".colorize(:red))
+  end
+
+  def self.log(type, log)
+    case type
+    when :info
+      puts(log)
+    when :warning
+      warn(log)
+    when :error
+      puts(log)
+    end
+    file_logger(type, log) if configatron.logger.file.use == true
+  end
+
+  def self.file_logger(type, log)
+    path = configatron.logger.file.path
+    logger = Logger.new(path)
+    case type
+    when :info
+      logger.info(log)
+    when :warning
+      logger.warning(log)
+    when :error
+      logger.error(log)
+    end
   end
 end

data/lib/sleeproom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SleepRoom
-  VERSION = "0.1.1"
+  VERSION = "0.4.1"
 end

data/sleeproom.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.executables   = ["sleeproom"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("colorize")
-  spec.add_runtime_dependency("async")
-  spec.add_runtime_dependency("async-websocket")
-  spec.add_runtime_dependency("configatron")
-  spec.add_runtime_dependency("async-http-faraday")
-  spec.add_runtime_dependency("terminal-table")
+  spec.add_runtime_dependency("colorize", "~> 0.8.0")
+  spec.add_runtime_dependency("async", "~> 1.26.0")
+  spec.add_runtime_dependency("async-websocket", "~> 0.15.0")
+  spec.add_runtime_dependency("configatron", "~> 4.5.0")
+  spec.add_runtime_dependency("async-http-faraday", "~> 0.9.0")
+  spec.add_runtime_dependency("terminal-table", "~> 1.8.0")
 
   spec.post_install_message = <<~STR
     SleepRoom 需要:

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: sleeproom
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: configatron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: async-http-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 description: 
 email:
 - i@wug.moe