seapig-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f7364428c78b79e180bfa73ef7d9478e0ddb806
-  data.tar.gz: 2b8aec0e3f32c6abbb1cdb04a8a630a07b38c698
+  metadata.gz: 8a2fbbcbaa6f58227bed8ad11499cce4d6568fa8
+  data.tar.gz: a491e1e3deb1286f88ff47939695963455930a20
 SHA512:
-  metadata.gz: 4d0e1473c2ee4477195cd91383656ae2b4111f3108f75791d8d3cdb16d7319836698bcb109327265ab33b1a3dfb2294155e16d2d140aa8ba1fa463337118c260
-  data.tar.gz: 6cacf5cede39228c208c181a1324c30be6abd8e795c1e37a30133a788bb6155f5fc83d76210c20f81af70a6ce69ef948635eb99a7ed443ced237cabc47fd0936
+  metadata.gz: 85a50080420cefbbb952596abcaa633c60e91b48f7dbcb8fbd635eeaed28b21178529b4e96e5ba029f7375fa55334c3a9662cae985fc712a602293f71f37e3c7
+  data.tar.gz: 37ce453bea6c88a70de678fea4c8f9b88bdcb425b5cb3299b042f89ecd7c369fd0ca4e52d877a1a9335661cae905c1a79e2c98f9a32d9b81c75d9c142b77a4b3

data/lib/seapig/client.rb

@@ -143,7 +143,6 @@ class SeapigServer
 
 	def master(object_id)
 		object = SeapigObject.new(self, object_id)
-		object.version = nil
 		@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id) if @connected
 		@master_objects[object_id] = object
 	end

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -81,7 +81,6 @@ files:
 - bin/seapig-observer
 - bin/seapig-worker
 - lib/seapig-client.rb
-- lib/seapig/#client.rb#
 - lib/seapig/client.rb
 - lib/seapig/version.rb
 - test/integration/navigation_test.rb

data/lib/seapig/#client.rb#

@@ -1,251 +0,0 @@
-require 'websocket-eventmachine-client'
-require 'json'
-require 'jsondiff'
-require 'hana'
-
-class SeapigServer
-
-	attr_reader :socket
-	
-	def initialize(uri, options={})
-		@connected = false
-		@uri = uri
-		@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
-
-		@last_communication_at = Time.new.to_f
-		@socket = WebSocket::EventMachine::Client.connect(uri: @uri)
-
-		@socket.onopen {
-			@connected = true
-			@socket.send JSON.dump(action: 'client-options-set', options: @options)
-			@slave_objects.each_pair { |object_id, object|
-				@socket.send JSON.dump(action: 'object-consumer-register', id: object_id, latest_known_version: object.version)
-			}
-			@master_objects.each_pair { |object_id, object|
-				@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id)
-			}
-			@last_communication_at = Time.new.to_f
-		}
-		
-		@socket.onmessage { |message|
-			message = JSON.load message
-			#p message['action'], message['id'], message['patch']
-			case message['action']
-			when 'object-update'
-				@slave_objects.values.each { |object|
-					object.patch(message) if object.matches?(message['id'])
-				}
-			when 'object-destroy'
-				@slave_objects.values.each { |object|
-					object.destroy(message) if object.matches?(message['id'])
-				}
-			when 'object-produce'
-				handler = @master_objects.keys.find { |key| key.include?('*') and (message['id'] =~ Regexp.new(Regexp.escape(key).gsub('\*','.*?'))) or (message['id'] == key) }
-				@master_objects[handler].onproduce_proc.call(message['id']) if @master_objects[handler].onproduce_proc
-				@master_objects[handler].upload(0,{},message['id']) if @master_objects[handler]
-			else
-				p :wtf, message
-			end
-			@last_communication_at = Time.new.to_f
-		}
-		
-		@socket.onclose { |code, reason|
-			puts 'Seapig connection died unexpectedly (code:'+code.inspect+', reason:'+reason.inspect+'), reconnecting in 1s'
-			EM.add_timer(1) {
-				connect
-			}
-		}
-
-		@socket.onerror { |error|
-			puts 'Seapig error: '+error.inspect
-		}
-
-		@socket.onping {
-			@last_communication_at = Time.new.to_f
-		}
-
-	end
-	
-
-	
-	def disconnect(detach_fd = false)
-		@connected = false
-		if @timeout_timer
-			@timeout_timer.cancel
-			@timeout_timer = nil
-		end
-		if @socket
-			@socket.onclose {}
-			if detach_fd
-				IO.new(@socket.detach).close
-			else
-				@socket.close
-			end
-			@socket = nil
-		end
-	end
-
-
-	def detach_fd
-		disconnect(true)
-	end
-	
-	
-	def slave(object_id)
-		object = if object_id.include?('*') then SeapigWildcardObject.new(self, object_id) else SeapigObject.new(self, object_id) end
-		@socket.send JSON.dump(action: 'object-consumer-register', id: object_id, latest_known_version: object.version) if @connected
-		@slave_objects[object_id] = object
-	end
-
-
-	def master(object_id)
-		object = SeapigObject.new(self, object_id)
-		object.version = Time.new.to_f
-		@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id) if @connected
-		@master_objects[object_id] = object
-	end
-end
-
-
-class SeapigObject < Hash
-
-	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall, :parent, :destroyed
-
-
-	def matches?(id)
-		id =~ Regexp.new(Regexp.escape(@object_id).gsub('\*','.*?'))
-	end
-
-
-	def initialize(server, object_id, parent = nil)
-		@server = server
-		@object_id = object_id
-		@version = 0
-		@onchange_proc = nil
-		@onproduce_proc = nil
-		@valid = false
-		@shadow = JSON.load(JSON.dump(self))
-		@stall = false
-		@parent = parent
-		@destroyed = false
-	end
-
-	
-	def onchange(&block)
-		@onchange_proc = block
-	end
-
-
-	def onproduce(&block)
-		@onproduce_proc = block
-	end
-
-	
-	def patch(message)
-		if not message['old_version']
-			self.clear
-		elsif message['old_version'] == 0
-			self.clear
-		elsif not @version == message['old_version']
-			p @version, message
-			puts "Seapig lost some updates, this should never happen"
-			exit 2
-		end		
-		Hana::Patch.new(message['patch']).apply(self)
-		@version = message['new_version']
-		@valid = true
-		@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
-		@version += 1
-		@shadow = sanitized
-		upload(old_version, old_object, @object_id)	
-	end
-
-
-	def sanitized
-		JSON.load(JSON.dump(self))
-	end
-
-
-	def upload(old_version, old_object, object_id)
-		message = {
-			id: object_id,
-			action: 'object-patch',
-			old_version: old_version,
-			new_version: @version,
-		}
-		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
-	
-	
-
-end
-
-
-
-class SeapigWildcardObject < SeapigObject
-
-
-	def patch(message)
-		self[message['id']] ||= SeapigObject.new(@server, message['id'], self)
-		self[message['id']].patch(message)
-#		puts JSON.dump(self)
-		@onchange_proc.call(self[message['id']]) if @onchange_proc
-	end
-
-
-	def destroy(message)
-		if destroyed = self.delete(message['id'])
-			destroyed.destroyed = true
-			@onchange_proc.call(destroyed) if @onchange_proc
-		end
-	end
-
-end
-
-