seapig-client 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85c9742df745b66c263c58793d7651c2e47f081
-  data.tar.gz: d8f5c63f05b55914e2a2514da60f4a66f64ac717
+  metadata.gz: 40e03252696dd652e32f57c27c9eb21bc5b46305
+  data.tar.gz: 57da37b0536d9ce54d22d08b697140d7828bf59c
 SHA512:
-  metadata.gz: a346602a2e0ac18c9a333685471d0c2125ffd603704a7e76059ec96dc207f0297536ece9acd36effd95a71218a23b8532bfa8a8364cbad470bf55a86853412da
-  data.tar.gz: e9321722d529bce9ede40dda180bcbafd5deeeee9839ed5c13905bd720770b79b4035b19a7aad4f4ea543aa9ef67c2c168f29d055affe0fe9a47e60f091af20e
+  metadata.gz: 466f428a9e0ec11d2adec3595a90ae6abdb1cbd36cd1e06165a95e7658404d431d0f2264d77f08ac7e9b53512804ca4b962425d4fb82fd642efcedcf052c8ef9
+  data.tar.gz: d2c93c3b8427851dfea92da95c77f81abea1693294916a27ce25107c6ea6d44cc7f2ab887d344a2f732bad4aca1b05edc3a75a1ba75febb3e8eb31447c58a236

data/bin/seapig-worker

@@ -1,28 +1,16 @@
 #!/bin/env ruby
 
-require 'websocket-eventmachine-client'
-require 'json'
-require 'jsondiff'
+require 'seapig-client'
 
 
 class Producer
 
-	@producers_by_regexp = {}
-	@patterns = []
-
-	def self.patterns
-		@patterns
-	end
-
-
-	def self.init
-		@producers_by_regexp = Hash[*ObjectSpace.each_object(Class).select { |klass| klass < Producer }.map { |klass| klass.patterns.map { |pattern| [Regexp.new(Regexp.escape(pattern).gsub('\*','.*?')), klass] }}.flatten]
-		@patterns = @producers_by_regexp.values.map { |klass| klass.patterns }.flatten
+	class << self
+		attr_reader :patterns
 	end
 	
-
-	def self.for(object_id)
-		@producers_by_regexp.each_pair.find { |pattern,generator| object_id =~ pattern }[1]
+	def self.all
+		@producers ||= ObjectSpace.each_object(Class).select { |klass| klass < Producer }
 	end
 	
 end
@@ -31,37 +19,25 @@ end
 	Dir[load_path+'/seapigs/*.rb'].each { |f| require f }
 }
 
-Producer.init
 
 
-EM.run {
 
-	socket = WebSocket::EventMachine::Client.connect(uri: ARGV[0])
+EM.run {
 
-	
-	socket.onopen {
-		socket.send(JSON.dump(action: 'client-options-set', options: {name: 'worker'}))
-		Producer.patterns.each { |pattern|
-			socket.send JSON.dump(action: 'object-producer-register', pattern: pattern)
+	server = SeapigServer.new(ARGV[0], name: 'worker')
+
+	Producer.all.each { |producer|
+		producer.patterns.each { |pattern|
+			object = server.master(pattern)
+			object.onproduce { |object_id|
+				start = Time.new
+				puts 'Generating '+object_id
+				data,version = producer.produce(object_id)
+				object.set(data, version)
+				puts 'Generated %25s in %5.2fs'%[object_id, (Time.new-start).to_f]
+			}
 		}
 	}
 
-	
-	socket.onmessage { |message|
-		message = JSON.load message
-		case message['action']
-		when 'object-produce'
-			start = Time.new
-			object, version = Producer.for(object_id = message['id']).produce(object_id)
-			puts 'Generated %25s in %5.2fs'%[object_id, (Time.new-start).to_f]
-			socket.send JSON.dump(action: 'object-patch', id: object_id, old_version: 0, new_version: version, value: object)
-		end
-	}
-
-	
-	socket.onclose { |code, reason|
-		EM.stop
-	}
-
 }
 

data/lib/seapig/client.rb

@@ -45,7 +45,6 @@ class SeapigServer
 			}
 			@master_objects.each_pair { |object_id, object|
 				@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id)
-				object.upload(0, {})
 			}
 			@last_communication_at = Time.new.to_f
 		}
@@ -63,6 +62,7 @@ class SeapigServer
 					object.destroy(message) if object.matches?(message['id'])
 				}
 			when 'object-produce'
+				@master_objects[message['id']].onproduce_proc.call(message['id']) if @master_objects[message['id']].onproduce_proc
 				@master_objects[message['id']].upload(0,{}) if @master_objects[message['id']]
 			else
 				p :wtf, message
@@ -71,10 +71,15 @@ class SeapigServer
 		}
 		
 		@socket.onclose { |code, reason|
-			puts 'Seapig connection died unexpectedly, reconnecting'
+			puts 'Seapig connection died unexpectedly (code:'+code.inspect+', reason:'+reason.inspect+'), reconnecting in 1s'
+			sleep 1
 			connect
 		}
 
+		@socket.onerror { |error|
+			puts 'Seapig error: '+error.inspect
+		}
+
 		@socket.onping {
 			@last_communication_at = Time.new.to_f
 		}
@@ -82,7 +87,8 @@ class SeapigServer
 	end
 	
 
-	def disconnect
+	
+	def disconnect(detach_fd: false)
 		@connected = false
 		if @timeout_timer
 			@timeout_timer.cancel
@@ -90,15 +96,18 @@ class SeapigServer
 		end
 		if @socket
 			@socket.onclose {}
-			@socket.close
+			if detach_fd
+				IO.new(@socket.detach).close
+			else
+				@socket.close
+			end
 			@socket = nil
 		end
 	end
 
 
 	def detach_fd
-		@connected = false
-		IO.new(@socket.detach).close
+		disconnect(true)
 	end
 	
 	
@@ -120,7 +129,7 @@ end
 
 class SeapigObject < Hash
 
-	attr_accessor :version, :object_id, :valid
+	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall
 
 
 	def matches?(id)
@@ -132,14 +141,21 @@ class SeapigObject < Hash
 		@server = server
 		@object_id = object_id
 		@version = 0
-		@onchange = nil
+		@onchange_proc = nil
+		@onproduce_proc = nil
 		@valid = false
 		@shadow = JSON.load(JSON.dump(self))
+		@stall = false
 	end
 
 	
 	def onchange(&block)
-		@onchange = block
+		@onchange_proc = block
+	end
+
+
+	def onproduce(&block)
+		@onproduce_proc = block
 	end
 
 	
@@ -156,10 +172,23 @@ class SeapigObject < Hash
 		Hana::Patch.new(message['patch']).apply(self)
 		@version = message['new_version']
 		@valid = true
-		@onchange.call(self) if @onchange
+		@onchange_proc.call(self) if @onchange_proc
 	end
 
 
+	def set(data, version)
+		if data
+			@stall = false
+			self.clear
+			self.merge!(data)
+			@shadow = sanitized
+		else
+			@stall = true
+		end
+		@version = version
+	end
+
+	
 	def changed
 		old_version = @version
 		old_object = @shadow
@@ -180,8 +209,12 @@ class SeapigObject < Hash
 			action: 'object-patch',
 			old_version: old_version,
 			new_version: @version,
-			patch: JsonDiff.generate(old_object, @shadow)
 		}
+		if old_version == 0 or @stall
+			message.merge!(value: (if @stall then false else @shadow end))
+		else
+			message.merge!(patch: JsonDiff.generate(old_object, @shadow))
+		end
 		@server.socket.send JSON.dump(message)
 	end
 	

data/lib/seapig/version.rb

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

metadata

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