seapig-client 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9aab4c9100b539a30ae428a7bc46603cec793ea
-  data.tar.gz: 8b46246f0818e75e123c2d15b33be11ed71af2de
+  metadata.gz: 4de1419541d11ae6d08c5d34da0cea89a9194a2f
+  data.tar.gz: b6b6f5a07058c499bf764ab0367393d8460efc4f
 SHA512:
-  metadata.gz: 6c4e04f7146c701250d55acc9520394b4208afc081f65177b2350d136c56ba89d6728c47e0974a779c5cd2c42dde7707103510c0cbbd4139e93c29466524c1b6
-  data.tar.gz: e03e11fdff88a91ab0d78062914beb59668759d423f839158e4fb20a8dae66351a14cde48133d44944002f00a08d4db456d6318b6edf1b11a6a7c926f2592a62
+  metadata.gz: d98afaf6d50f95b10b6655cbb6416ad7241ab4ca0112a1d353bd2a29f07b090de5d03cabb7ee4e7d1382e1b3dd41f15d93217c7238de0848ba0144fc7f2df1f8
+  data.tar.gz: a8b2f5160f7a5e1c2d3f160a4c3d0d50bb84159c9d47606bb0d0a8e248ebe1d8fd79e81dfe1846c8813d62186e0dd47e94479c989a1f0a8379cbd1022e2fb05d

data/lib/seapig/#client.rb#

@@ -0,0 +1,251 @@
+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
+
+

data/lib/seapig/client.rb

@@ -2,18 +2,39 @@ require 'websocket-eventmachine-client'
 require 'json'
 require 'jsondiff'
 require 'hana'
+require 'narray'
+
+
+module WebSocket
+	module Frame
+		class Data < String
+			def getbytes(start_index, count)
+				data = self[start_index, count]
+				if @masking_key
+					payload_na = NArray.to_na(data,"byte")
+					mask_na = NArray.to_na((@masking_key.pack("C*")*((data.size/4) + 1))[0...data.size],"byte")
+					data = (mask_na ^ payload_na).to_s
+				end
+				data
+			end
+		end
+	end
+end
+
+
 
 class SeapigServer
 
-	attr_reader :socket
-	
+	attr_reader :socket, :connected
+
 	def initialize(uri, options={})
 		@connected = false
 		@uri = uri
 		@options = options
 		@slave_objects = {}
 		@master_objects = {}
-		
+		@notifier_objects = {}
+
 		connect
 	end
 
@@ -30,14 +51,15 @@ class SeapigServer
 			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 {
+			puts 'Connected to seapig server'
 			@connected = true
 			@socket.send JSON.dump(action: 'client-options-set', options: @options)
 			@slave_objects.each_pair { |object_id, object|
@@ -48,7 +70,7 @@ class SeapigServer
 			}
 			@last_communication_at = Time.new.to_f
 		}
-		
+
 		@socket.onmessage { |message|
 			message = JSON.load message
 			#p message['action'], message['id'], message['patch']
@@ -70,15 +92,16 @@ class SeapigServer
 			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'
-			sleep 1
-			connect
+			EM.add_timer(1) { connect }
 		}
 
 		@socket.onerror { |error|
 			puts 'Seapig error: '+error.inspect
+			@socket.close
+			EM.add_timer(1) { connect }
 		}
 
 		@socket.onping {
@@ -86,9 +109,8 @@ class SeapigServer
 		}
 
 	end
-	
 
-	
+
 	def disconnect(detach_fd = false)
 		@connected = false
 		if @timeout_timer
@@ -110,8 +132,8 @@ class SeapigServer
 	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
@@ -121,13 +143,22 @@ class SeapigServer
 
 	def master(object_id)
 		object = SeapigObject.new(self, object_id)
-		object.version = Time.new.to_f
+		object.version = (Time.new.to_f*1000000).to_i
 		@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id) if @connected
 		@master_objects[object_id] = object
 	end
+
+
+	def notifier(object_id)
+		object = SeapigObject.new(self, object_id)
+		object.version = 0
+		@notifier_objects[object_id] = object
+	end
+
 end
 
 
+
 class SeapigObject < Hash
 
 	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall, :parent, :destroyed
@@ -151,7 +182,7 @@ class SeapigObject < Hash
 		@destroyed = false
 	end
 
-	
+
 	def onchange(&block)
 		@onchange_proc = block
 	end
@@ -161,18 +192,20 @@ class SeapigObject < Hash
 		@onproduce_proc = block
 	end
 
-	
+
 	def patch(message)
-		if not message['old_version']
-			self.clear
-		elsif message['old_version'] == 0
+		if (not message['old_version']) or (message['old_version'] == 0) or (message['value'])
 			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)
+		end
+		if message['value']
+			self.merge!(message['value'])
+		else
+			Hana::Patch.new(message['patch']).apply(self)
+		end
 		@version = message['new_version']
 		@valid = true
 		@onchange_proc.call(self) if @onchange_proc
@@ -191,13 +224,13 @@ class SeapigObject < Hash
 		@version = version
 	end
 
-	
-	def changed
+
+	def changed(new_version=nil)
 		old_version = @version
 		old_object = @shadow
-		@version += 1
+		@version = (new_version or (Time.new.to_f*1000000).to_i)
 		@shadow = sanitized
-		upload(old_version, old_object, @object_id)	
+		upload(old_version, old_object, @object_id)
 	end
 
 
@@ -216,12 +249,16 @@ class SeapigObject < Hash
 		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))
+			diff = JsonDiff.generate(old_object, @shadow)
+			value = @shadow
+			if JSON.dump(diff.size) < JSON.dump(value.size) #can we afford this?
+				message.merge!(patch: diff)
+			else
+				message.merge!(old_version: 0, value: @shadow)
+			end
 		end
 		@server.socket.send JSON.dump(message)
 	end
-	
-	
 
 end
 

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: narray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: meh
 email:
 - maciej.blomberg@mikoton.com
@@ -67,6 +81,7 @@ 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
@@ -92,11 +107,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Transient object synchronization lib - client
 test_files:
+- test/seapig_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-- test/seapig_test.rb