hakuban 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79db90522bce42223139845bf81169a9e75a2997a90e71952b0b00d852272ff6
-  data.tar.gz: 35d50834b1a5a2626e9e3ad62c063b04acfc86569f887e57afe2578125d994cc
+  metadata.gz: aca4a31cd75c69917785c7d5d3110c9db07d44c9be8394b37714fcae3019b5f6
+  data.tar.gz: a3c81f4d62a36fbac4bbdf6cf709909bcc132b4330e62de9b2fb39ddd4e48e72
 SHA512:
-  metadata.gz: 5d74f9761c28495c9d6caed241fb907147aff987d8c9d5526ded5d15f6e43ac781354baae9894fc74684ecad374646d8fde4cf90b26550a2e954f6bbf95f5ecb
-  data.tar.gz: 2c48edc2b71800bf19e3a1f267de234493e1e54aa6ae6fb4042ba1fc79f22a35aa28015e2d0b37f6ddb5c491817cf6698330b609dba96077e6d26ddcd441cb28
+  metadata.gz: 3a59840edfda985efda0031603f8901a24026b6edcc044f6ac61f3c04d6e8c4cae9199eb2b10b8496810b4182f85337907ee518f3d136c4a8bb829f10f66eb9d
+  data.tar.gz: bf7e24798ea39f0524075fcacc5a47bf8f060d72a797d2b7b92827be1b6cda252df2e8da8e64cd4c8e937b2ef08f5ae21e87ff15e3174ed9164ef2a6b64d7642

data/lib/hakuban/ffi.rb

@@ -32,6 +32,7 @@ module Hakuban::FFI
 	
 	class FFIObjectExposeState < FFI::Struct
 		layout :version_length, :size_t, :version, :pointer, :data_type_length, :size_t, :data_type, :pointer, :raw_length, :size_t, :raw, :pointer
+		attr_accessor :data_type_strings
 	
 		def self.construct(version, data_type, data)
 			state = FFIObjectExposeState::new
@@ -40,7 +41,8 @@ module Hakuban::FFI
 			state[:version].write_array_of_int64(version)
 			state[:data_type_length] = data_type.size
 			state[:data_type] = FFI::MemoryPointer.new(:pointer, data_type.size)
-			state[:data_type].write_array_of_pointer(data_type.map {|string| FFI::MemoryPointer.from_string(string)})
+			state.data_type_strings = data_type.map {|string| FFI::MemoryPointer.from_string(string)}
+			state[:data_type].write_array_of_pointer(state.data_type_strings)
 			state[:raw] = FFI::MemoryPointer.from_string(data)
 			state[:raw_length] = data.size
 			state
@@ -61,7 +63,8 @@ module Hakuban::FFI
 	
 	class FFIObjectDescriptor < FFI::Struct
 		layout :tags_count, :size_t, :tags, :pointer, :json, :pointer
-	
+		attr_accessor :tags_strings
+		
 		def tags
 			self[:tags].read_array_of_pointer(self[:tags_count]).map { |string| JSON.parse(string.read_string()) }	# does this copy the string? 
 		end
@@ -71,12 +74,11 @@ module Hakuban::FFI
 		end
 	
 		def self.construct(tags,json)
-			tags_strings = tags.map { |tag| JSON.dump(tag) }
-			tags_strings_array = FFI::MemoryPointer.new(:pointer, tags_strings.size)
-			tags_strings_array.write_array_of_pointer(tags_strings.map {|string| FFI::MemoryPointer.from_string(string)})
 			descriptor = FFIObjectDescriptor.new
 			descriptor[:tags_count] = tags.size
-			descriptor[:tags] = tags_strings_array
+			descriptor.tags_strings = tags.map { |tag| FFI::MemoryPointer.from_string(JSON.dump(tag)) }
+			descriptor[:tags] = FFI::MemoryPointer.new(:pointer, descriptor.tags_strings.size)
+			descriptor[:tags].write_array_of_pointer(descriptor.tags_strings)
 			descriptor[:json] = FFI::MemoryPointer.from_string(JSON.dump(json))
 			descriptor
 		end
@@ -146,7 +148,9 @@ module Hakuban::FFI
 	attach_function :hakuban_object_callback_unregister, [ :pointer ], :void, blocking: true
 
 	attach_function :hakuban_tokio_init_multi_thread, [ :size_t ], :pointer
-	attach_function :hakuban_tokio_websocket_connector_new, [ :pointer, :string ], FFITokioWebsocketConnectorNewResult.by_value
-	attach_function :hakuban_tokio_websocket_connector_start, [ :pointer, :pointer, :pointer ], :void
+	attach_function :hakuban_tokio_websocket_connector_new, [ :pointer, :pointer, :string ], FFITokioWebsocketConnectorNewResult.by_value
+	attach_function :hakuban_tokio_websocket_connector_drop, [ :pointer, :pointer ], :void
+
+	attach_function :hakuban_logger_initialize, [ :string ], :uint8
 
 end

data/lib/hakuban/hakuban.rb

@@ -4,6 +4,8 @@ require_relative './ffi.rb'
 
 #TODO: explicit drops?
 #TODO: privative methods
+#TODO: error classes
+
 
 module Hakuban
 
@@ -28,6 +30,19 @@ module Hakuban
 	end
 
 
+	@@logger_initialized = false
+
+	def self.logger_initialize(default_level, skip_if_already_initialized = false)
+		if @@logger_initialized and !skip_if_already_initialized
+			raise "Logger already initialized. This can't be done more than once. Make sure logger_initialize is called before any LocalNode gets constructed."  
+		end
+		if not @@logger_initialized
+			raise "Invalid default log level string"  if FFI::hakuban_logger_initialize(default_level) != 0
+			@@logger_initialized = true
+		end
+	end
+
+
 	class LocalNode
 
 		#TODO: explicit drop
@@ -35,7 +50,8 @@ module Hakuban
 		attr_reader :local_node_pointer  #todo: hide
 
 		def initialize(name=nil)
-			result = FFI::hakuban_local_node_new(name || "local")
+			Hakuban::logger_initialize("hakuban=warn", true)
+			result = FFI::hakuban_local_node_new(name || File.basename(caller_locations(0..1)[1].path))
 			Hakuban::raise_if_error(result)
 			@local_node_pointer = ::FFI::AutoPointer.new(result[:local_node_pointer], FFI::method(:hakuban_local_node_drop))
 		end
@@ -111,6 +127,11 @@ module Hakuban
 		def hash
 			[@tags.hash, @json.hash].hash
 		end
+
+		def inspect
+			"#<ObjectDescriptor @tags={%s}, @json=%p>"%[self.tags.map(&:inspect).join(","), self.json]
+		end
+
 	end
 	
 
@@ -213,12 +234,13 @@ module Hakuban
 		def drop
 			@object_observe_pointer.free
 			@object_observe_pointer = nil
-			@queues.values.each { |pointer| pointer.free }
 			@queues.clear
 		end
 
-		def manage(object_class, *object_constructor_params)
-			object_class::new(self, @descriptor, *object_constructor_params)
+		def manage(manager=nil)
+			manager ||= ObjectManager.new
+			manager.contract = self
+			manager
 		end
 
 	end
@@ -264,15 +286,20 @@ module Hakuban
 			@queues.delete(queue)
 		end
 
+		def inspect
+			"#<ObjectExpose #{@descriptor}>"
+		end
+
 		def drop
 			@object_expose_pointer.free
 			@object_expose_pointer = nil
-			@queues.values.each { |pointer| pointer.free }
 			@queues.clear
 		end
 
-		def manage(object_class, *object_constructor_params)
-			object_class::new(self, @descriptor, *object_constructor_params)
+		def manage(manager=nil)
+			manager ||= ObjectManager.new
+			manager.contract = self
+			manager
 		end
 
 	end
@@ -280,7 +307,7 @@ module Hakuban
 
 	class ObjectObserveState
 
-		attr_reader :data, :data_type, :data_version
+		attr_reader :data, :data_type, :data_version, :synchronized
 
 		def initialize(raw_state)
 			@raw_state = raw_state
@@ -302,7 +329,7 @@ module Hakuban
 		end
 
 		def inspect
-			"#<ObjectObserveState version=#{@data_version}>"
+			"#<ObjectObserveState @synchronized=%p @version=%p>"%[@synchronized, @data_version]
 		end
 
 	end
@@ -357,12 +384,13 @@ module Hakuban
 		def drop
 			@tag_observe_pointer.free
 			@tag_observe_pointer = nil
-			@queues.values.each { |pointer| pointer.free }
 			@queues.clear
 		end
 
-		def manage(object_class, *object_constructor_params)
-			ObjectManager::new(self, object_class, *object_constructor_params)
+		def manage(manager=nil)
+			manager ||= ObjectManager.new
+			manager.contract = self
+			manager
 		end
 
 	end
@@ -418,12 +446,13 @@ module Hakuban
 		def drop
 			@tag_expose_pointer.free
 			@tag_expose_pointer = nil
-			@queues.values.each { |pointer| pointer.free }
 			@queues.clear
 		end
 
-		def manage(object_class, *object_constructor_params)
-			ObjectManager::new(self, object_class, *object_constructor_params)
+		def manage(manager=nil)
+			manager ||= ObjectManager.new
+			manager.contract = self
+			manager
 		end
 
 	end
@@ -452,10 +481,10 @@ module Hakuban
 
 		#TODO: drop	
 
-		def initialize(url)
-			result = FFI::hakuban_tokio_websocket_connector_new(Tokio.pointer, url)
+		def initialize(local_node, url)
+			result = FFI::hakuban_tokio_websocket_connector_new(Tokio.pointer, local_node.local_node_pointer, url)
 			Hakuban::raise_if_error(result)
-			@websocket_connector_pointer = result[:websocket_connector_pointer]
+			@websocket_connector_pointer = ::FFI::AutoPointer.new(result[:websocket_connector_pointer], WebsocketConnector.generate_drop)
 		end
 
 		def start(local_node)
@@ -464,38 +493,99 @@ module Hakuban
 			self
 		end
 
+		def self.generate_drop
+			proc { |pointer|
+				FFI::hakuban_tokio_websocket_connector_drop(Tokio.pointer, pointer)
+			}
+		end
+
 	end
 
 
 	# convenience utils
 
-	class ObjectManager
+	#TODO: replace this mess (<Hash, dynamic mixings) with some "deref"
+	class ObjectManager < Hash
+
+		module ObservedObjectManager
+			def descriptor;                             self.values.first.descriptor;              end
+			def state;                                  self.values.first.state;                   end
+			def data;                                   self.values.first.data;                    end
+			def version;                                self.values.first.verison;                 end
+			def synchronized;                           self.values.first.synchronized;            end
+			def construct_object(contract, descriptor); ObservedObject.new(contract, descriptor);  end
+		end
+
+		module ExposedObjectManager
+			def descriptor;                             self.values.first.descriptor;              end
+			def state=(params);                         self.values.first.state = params;          end
+			def data=(params);                          self.values.first.data = params;           end
+			def state_set(params);                      self.values.first.state_set(params);       end
+			def data_set(params);                       self.values.first.data_set(params);        end
+			def construct_object(contract, descriptor); ExposedObject.new(contract, descriptor);   end
+		end
+
+		module ObservedTagManager
+			def construct_object(contract, descriptor); ObservedObject.new(contract, descriptor);  end
+		end
+
+		module ExposedTagManager
+			def construct_object(contract, descriptor); ExposedObject.new(contract, descriptor);  end
+		end
 		
 		attr_reader :objects, :contract
 
-		def initialize(contract, object_class, *object_constructor_params)
+		def contract=(contract)
+			raise "You can't change contracts, sorry."  if @contract
 			@contract = contract
-			@objects = {}
+			case @contract.class.name
+				when "Hakuban::ObjectObserve" then singleton_class.include(ObservedObjectManager)
+				when "Hakuban::ObjectExpose"  then singleton_class.include(ExposedObjectManager)
+				when "Hakuban::TagObserve" then singleton_class.include(ObservedTagManager)
+				when "Hakuban::TagExpose" then singleton_class.include(ExposedTagManager)
+				else raise
+			end
+
 			@queue = Queue.new
-			contract.send_events_to(@queue, :object)
+			@contract.send_events_to(@queue, :object)
+			if @contract.kind_of?(ObjectObserve) or @contract.kind_of?(ObjectExpose)
+				event, param, descriptor = @queue.pop				 
+				raise if event != :object or param != :insert or not descriptor
+				self[descriptor] = self.construct_object(@contract, descriptor)
+			end
+
 			@thread = Thread.new {
 				loop {
-					event = @queue.shift
-					case event[0..1]
+					event,param,descriptor = @queue.shift
+					case [event, param]
 					when [:control, :quit]
 						break
 					when [:object, :insert]
-						@objects[event[2]] = object_class.new(@contract, event[2], *object_constructor_params)
+						self[descriptor] = construct_object(@contract, descriptor)
+						object_insert(self[descriptor])
 					when [:object, :change]
-						@objects[event[2]].change  if @objects[event[2]].respond_to?(:change)
+						object_change(self[descriptor])
 					when [:object, :remove]
-						raise if not deleted = @objects.delete(event[2])
-						deleted.drop  if deleted.respond_to?(:drop)
+						object_remove(delete(descriptor))
 					end
 				}
 			}
 		end
 
+
+		def object_insert(object)
+			# noop default
+		end
+
+		def object_change(object)
+			# noop default
+		end
+
+		def object_remove(object)
+			# noop default
+		end
+
+
 		def drop
 			@contract.stop_sending_objects_events_to(@queue)
 			@queue.push [:control, :quit]
@@ -509,11 +599,10 @@ module Hakuban
 			def initialize(contract, descriptor)
 				@contract, @descriptor = contract, descriptor
 			end
-		end
-	
+		end	
 
-		#TODO: fix the arity thing...
-		module ObservedObject
+		#TODO: remove the arity thing...
+		class ObservedObject < ManagedObject
 			def state
 				if @contract.method(:object_state).arity == 1
 					@contract.object_state(@descriptor)
@@ -530,22 +619,28 @@ module Hakuban
 			end
 		end
 
-		module ExposedObject
-			def state=(state)
+		class ExposedObject < ManagedObject
+			def state_set(state)
 				if @contract.method(:set_object_state).arity == 4
 					@contract.set_object_state(@descriptor, *state)
 				else
 					@contract.set_object_state(*state)
 				end
 			end
-			def data=(value)
-				timestamp = Time.new.to_f.floor
+			def state=(state)
+				state_set(state)
+			end
+			def data_set(value)
+				timestamp = Time.new.to_f
 				if @contract.method(:set_object_state).arity == 4
 					@contract.set_object_state(@descriptor,[1, timestamp.floor, ((timestamp - timestamp.floor)*1000000000).floor, 0],[],value)
 				else 
 					@contract.set_object_state([1, timestamp.floor, ((timestamp - timestamp.floor)*1000000000).floor, 0],[],value)
 				end
 			end
+			def data=(value)
+				data_set(value)
+			end
 		end
 	end
 

data/lib/hakuban/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hakuban
-	VERSION = "0.5.0"
+	VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec