seapig-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b204c40288eb02aa5d36a5a4340d2efd895371
-  data.tar.gz: 40f4f6fc3e561c77433d11f504385348f7801986
+  metadata.gz: c85c9742df745b66c263c58793d7651c2e47f081
+  data.tar.gz: d8f5c63f05b55914e2a2514da60f4a66f64ac717
 SHA512:
-  metadata.gz: c937e6c30e3931a79417ac4a1a08f303f6bf76b434048413a4070095ea66ffd0c9274cdb14fbba3962701087c77719e7a1c00136da891a6858dfb4cd3c33f8b7
-  data.tar.gz: 041bbea836c93cdc48e87b1aa52a91774eb44cce64e7d9c765075491aa6c3d41e8c4ea00c575cc8f08b22d4e4c2a1444f03c7fa0fa531cc68ebcf784fd8320ce
+  metadata.gz: a346602a2e0ac18c9a333685471d0c2125ffd603704a7e76059ec96dc207f0297536ece9acd36effd95a71218a23b8532bfa8a8364cbad470bf55a86853412da
+  data.tar.gz: e9321722d529bce9ede40dda180bcbafd5deeeee9839ed5c13905bd720770b79b4035b19a7aad4f4ea543aa9ef67c2c168f29d055affe0fe9a47e60f091af20e

data/lib/seapig/client.rb

@@ -13,8 +13,29 @@ class SeapigServer
 		@options = options
 		@slave_objects = {}
 		@master_objects = {}
+		
+		connect
+	end
+
+
+	def connect
+
+		if @socket
+			@socket.onclose {}
+			@socket.close
+		end
+
+		@timeout_timer ||= EM.add_periodic_timer(10) {
+			next if not @socket
+			next if Time.new.to_f - @last_communication_at < 20
+			puts "Seapig ping timeout, reconnecting"
+			connect
+		} 
+		
+		@connected = false
 
-		@socket = WebSocket::EventMachine::Client.connect(uri: uri)
+		@last_communication_at = Time.new.to_f
+		@socket = WebSocket::EventMachine::Client.connect(uri: @uri)
 
 		@socket.onopen {
 			@connected = true
@@ -26,6 +47,7 @@ class SeapigServer
 				@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id)
 				object.upload(0, {})
 			}
+			@last_communication_at = Time.new.to_f
 		}
 		
 		@socket.onmessage { |message|
@@ -45,20 +67,32 @@ class SeapigServer
 			else
 				p :wtf, message
 			end
+			@last_communication_at = Time.new.to_f
 		}
 		
 		@socket.onclose { |code, reason|
-			if @connected
-				puts 'Seapig connection died, quitting'
-				EM.stop
-			end
+			puts 'Seapig connection died unexpectedly, reconnecting'
+			connect
 		}
-	end
 
+		@socket.onping {
+			@last_communication_at = Time.new.to_f
+		}
+
+	end
+	
 
 	def disconnect
 		@connected = false
-		@socket.close
+		if @timeout_timer
+			@timeout_timer.cancel
+			@timeout_timer = nil
+		end
+		if @socket
+			@socket.onclose {}
+			@socket.close
+			@socket = nil
+		end
 	end
 
 

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client