sleeproom 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 602c623c73913b772f7b1375ce6a7d9c3415df23bcd564d78ae58ddb21fd7b7b
-  data.tar.gz: 3b6859da62f1a29c1f8f05b65d039a593f78ba6e5e6b4fa9d9c9636d5f6c56ca
+  metadata.gz: 8ccc2b043aff09d26b34628f302b06b38f3cca3aba8193bcd0164a294b6a74df
+  data.tar.gz: 97fac01b4349e11eaa28cdb0fb4dbe83c4c9d4874d29c7002abc3ba2ec2f757b
 SHA512:
-  metadata.gz: 2af5ad3283bcaa58d7b6524a12413b81ef1aaf294d0d5bc95e5abfdae9892a876bb7a7cd32f6a8ad56154054afe3c3e61f5f0fe69bb445f37935fe1c80fbca5f
-  data.tar.gz: 881a889d97e13a3a3c78c7a98a94563ddb1d2ecd338809ba313ae3748e4f10403dde1a6c8b48f70c0200c7426446a71da96671516be82f5bb9cd9940c94ab1a7
+  metadata.gz: 8ca356b737df0e57a5e442ff71e42a127698bcdd0b5a803272f35de0fcccc667d8b5796383795baa51706ba332f441ce2e4e59e54a971cbdc387d636cc489fd7
+  data.tar.gz: b3a840d7063a2a6ee531093134a56d3c975abb70fa826096c233f174a75d75692025543699597db2205333470e94cc5a6750bdf6a7be957a83f997376f5c047d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.1.2)
+    sleeproom (0.2.0)
       async
       async-http-faraday
       async-websocket

data/lib/sleeproom/record/record.rb

@@ -112,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)
@@ -131,17 +143,25 @@ module SleepRoom
       end
       
       def set_room_info
-        api = API::RoomAPI.new(room)
+        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 => 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.message)
+        log("[parseStreamingUrl] Retry...")
+        retry
       end
 
       def build_output(task: Async::Task.current)

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleeproom
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize