hakuban 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79890c306cc3df4c9d3382773a66d38fa6373c6f1c2c874301ba0409050ab20d
-  data.tar.gz: e17ffc0520c6605a3cb2b207de58fc98c19d3c8d2472adf681a99dcbcb48b450
+  metadata.gz: 7b1dd3c0a54ced0edb0c409842cb7d74ca6cadf8472ad6b7e15fec97198ef8ad
+  data.tar.gz: 228080f7a28f5718620a30af69cb4c277682508623937684fb961e0994b50a91
 SHA512:
-  metadata.gz: a243af479fa4f47245696cb408498ce37fb46c4ca03563fc7b648dbec40cc0a18c76d227358f1dc36a1c66c31f102dc042fcf162168210b8d87f863230f4bf3f
-  data.tar.gz: ef2eec57f61f45da32b363e9b77b6cdda3de545b82ff5fce506f5970509b998b195d229625ca590e496b2679cd7fc18da61497a478226cf69b73c04be136189d
+  metadata.gz: 8afdbc65c6eee3ff1d4475f89b12b88f72c970eb37890aff2e66fcbba2ccac5b5cc897859aa8eedb727f6b484d999875f83176cc34698788d64f72bd96b4e577
+  data.tar.gz: c67bbfc8d9e3205973f33d5041fb71c642a41667156feadea39fed0bda72f1a0734912be440ee8b5cb4a6c83dff6d28da3ae36ee34ed76caee791ff80e3ffff8

data/examples/all-top-managed.rb

@@ -2,15 +2,10 @@ require 'hakuban'
 require_relative './cpu-usage.rb'
 
 
-class Utilization < Hakuban::ObjectManager::ManagedObject
-	include Hakuban::ObjectManager::ObservedObject
-	include Hakuban::ObjectManager::ExposedObject
-	
-	attr_reader :id
-
-	def initialize(contract, descriptor)
-		super
-		@id = descriptor.json["id"]
+
+class UtilizationManager < Hakuban::ObjectManager
+	def object_insert(object)
+		object.id = object.descriptor.json["id"]
 	end
 end
 
@@ -18,17 +13,17 @@ end
 id = "#{$$}@#{`hostname`.strip}"
 
 hakuban = Hakuban::LocalNode.new
-connector = Hakuban::WebsocketConnector.new("ws://localhost:3001").start(hakuban)
-all_utilizations = hakuban.tag("utilizations").observe.manage(Utilization)
-my_utilization = hakuban.object(["utilizations"],{id: id}).expose.manage(Utilization)
+connector = Hakuban::WebsocketConnector.new(hakuban, "ws://localhost:3001")
+all_utilizations = hakuban.tag("utilizations").observe.manage(UtilizationManager.new)
+my_utilization = hakuban.object(["utilizations"],{id: id}).expose.manage(UtilizationManager.new)
 
 previous_cpu_usage_state = nil
 loop {
 	previous_cpu_usage_state, cpu_usage = CPU::current_usage(previous_cpu_usage_state)
-	my_utilization.data = [cpu_usage]
+	my_utilization.data = {"percentage"=>cpu_usage}  if cpu_usage
 
-	utilizations = all_utilizations.objects.values.sort_by(&:id).map { |utilization|
-		[utilization.id, utilization.data&.first]
+	utilizations = all_utilizations.values.sort_by(&:id).map { |utilization|
+		[utilization.id, utilization.data&.dig("percentage")]
 	}.select { |id, utilization| utilization }
 	next sleep 1 if utilizations.empty?
 

data/examples/all-top-simple.rb

@@ -5,7 +5,7 @@ require_relative './cpu-usage.rb'
 id = "#{$$}@#{`hostname`.strip}"
 
 hakuban = Hakuban::LocalNode.new
-connector = Hakuban::WebsocketConnector.new("ws://localhost:3001").start(hakuban)
+connector = Hakuban::WebsocketConnector.new(hakuban, "ws://localhost:3001")
 all_utilizations = hakuban.tag("utilizations").observe
 my_utilization = hakuban.object(["utilizations"],{id: id}).expose
 
@@ -13,11 +13,11 @@ previous_cpu_usage_state = nil
 
 loop {
 	previous_cpu_usage_state, cpu_usage = CPU::current_usage(previous_cpu_usage_state)
-	my_utilization.set_object_state([Time.new.to_f],[],[cpu_usage])    if cpu_usage
+	my_utilization.set_object_state([Time.new.to_f],{ "percentage"=>cpu_usage })    if cpu_usage
 
 	all_utilizations.object_descriptors.map { |descriptor|
 		if data = all_utilizations.object_state(descriptor).data
-			puts "#{descriptor.json["id"]} -> #{data.first}"
+			puts "#{descriptor.json["id"]} -> #{data["percentage"]}"
 		end
 	}
 

data/lib/hakuban/hakuban.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'ostruct'
 
 require_relative './ffi.rb'
 
@@ -50,20 +51,53 @@ module Hakuban
 		attr_reader :local_node_pointer  #todo: hide
 
 		def initialize(name=nil)
+			@default_serializer = lambda { |data_type, data| 
+				[["JSON"]+data_type, JSON.dump(data)] 
+			}
+			@default_deserializer = lambda { |data_type, data| 
+				raise "Expected JSON serialized data, got: #{dat_type}"  if data_type[0] != "JSON"
+				[data_type[1..-1], JSON.load(data)] 
+			}
 			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
 
+		def with_default_serializer(&block)
+			@default_serializer = block
+			self
+		end
+
+		def with_default_deserializer(&block)
+			@default_deserializer = block
+			self
+		end
+
+		def default_serializer(&block)
+			if block_given?
+				@default_serializer = block
+			else
+				@default_serializer
+			end
+		end
+
+		def default_deserializer(&block)
+			if block_given?
+				@default_deserializer = block
+			else
+				@default_deserializer
+			end
+		end
+
 		def object(tags, descriptor)
 			#TODO: accept real descriptor too
-			ObjectBuilder.new(self, ObjectDescriptor.new(tags,descriptor))
+			ObjectBuilder.new(self, ObjectDescriptor.new(tags,descriptor), @default_serializer, @default_deserializer)
 		end
 
 		def tag(descriptor)
 			#TODO: accept real descriptor too
-			TagBuilder.new(self, TagDescriptor.new(descriptor))
+			TagBuilder.new(self, TagDescriptor.new(descriptor), @default_serializer, @default_deserializer)
 		end
 
 	end
@@ -71,16 +105,24 @@ module Hakuban
 
 	class ObjectBuilder
 
-		def initialize(store, descriptor)
-			@store, @descriptor = store, descriptor
+		def initialize(store, descriptor, serializer, deserializer)
+			@store, @descriptor, @serializer, @deserializer = store, descriptor, serializer, deserializer
 		end
 
 		def observe
-			ObjectObserve.new(@store, @descriptor)
+			ObjectObserve.new(@store, @descriptor, @deserializer)
 		end
 
 		def expose
-			ObjectExpose.new(@store, @descriptor)
+			ObjectExpose.new(@store, @descriptor, @serializer)
+		end
+
+		def with_serializer(&block)
+			@serializer = block
+		end
+
+		def with_deserializer(&block)
+			@deserializer = block
 		end
 
 	end
@@ -88,16 +130,24 @@ module Hakuban
 
 	class TagBuilder
 
-		def initialize(store, descriptor)
-			@store, @descriptor = store, descriptor
+		def initialize(store, descriptor, serializer, deserializer)
+			@store, @descriptor, @serializer, @deserializer = store, descriptor, serializer, deserializer
 		end
 
 		def observe
-			TagObserve.new(@store, @descriptor)
+			TagObserve.new(@store, @descriptor, @deserializer)
 		end
 
 		def expose
-			TagExpose.new(@store, @descriptor)
+			TagExpose.new(@store, @descriptor, @serializer)
+		end
+
+		def with_serializer(&block)
+			@serializer = block
+		end
+
+		def with_deserializer(&block)
+			@deserializer = block
 		end
 
 	end
@@ -200,8 +250,8 @@ module Hakuban
 
 		attr_reader :descriptor
 
-		def initialize(local_node, descriptor)
-			@local_node, @descriptor = local_node, descriptor
+		def initialize(local_node, descriptor, deserializer)
+			@local_node, @descriptor, @deserializer = local_node, descriptor, deserializer
 			result = FFI::hakuban_object_observe_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
 			@object_observe_pointer = ::FFI::AutoPointer.new(result[:object_observe_pointer], FFI::method(:hakuban_object_observe_drop))
@@ -210,7 +260,7 @@ module Hakuban
 
 		def object_state
 			raise "Attempt to use after 'drop'"  if not @object_observe_pointer
-			ObjectObserveState.new(FFI::hakuban_object_observe_state_borrow(@object_observe_pointer))
+			ObjectObserveState.new(FFI::hakuban_object_observe_state_borrow(@object_observe_pointer), @deserializer)
 		end
 
 		def send_events_to(queue, *prefix)
@@ -250,19 +300,18 @@ module Hakuban
 
 		attr_reader :descriptor
 
-		def initialize(local_node, descriptor)
-			@local_node, @descriptor = local_node, descriptor
+		def initialize(local_node, descriptor, serializer)
+			@local_node, @descriptor, @serializer = local_node, descriptor, serializer
 			result = FFI::hakuban_object_expose_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
 			@object_expose_pointer = ::FFI::AutoPointer.new(result[:object_expose_pointer], FFI::method(:hakuban_object_expose_drop))
 			@queues = {}
 		end
 
-		def set_object_state(version, data_type, data)
+		def set_object_state(version, data, data_type = [])
 			raise "Attempt to use after 'drop'"  if not @object_expose_pointer
-			data_type = ["MessagePack"] + data_type
-			serialized = MessagePack.pack(data)
-			result = FFI::hakuban_object_expose_state(@object_expose_pointer, FFI::FFIObjectExposeState.construct(version, data_type, serialized))
+			serialized_data_type, serialized_data = @serializer.call(data_type, data)
+			result = FFI::hakuban_object_expose_state(@object_expose_pointer, FFI::FFIObjectExposeState.construct(version, serialized_data_type, serialized_data))
 			Hakuban::raise_if_error(result)
 			result[:changed] == 1
 		end
@@ -309,12 +358,12 @@ module Hakuban
 
 		attr_reader :data, :data_type, :data_version, :synchronized
 
-		def initialize(raw_state)
+		def initialize(raw_state, deserializer)
 			@raw_state = raw_state
 			@synchronized = (raw_state[:synchronized] == 1)
-			@data_type = raw_state[:data_type].read_array_of_pointer(raw_state[:data_type_length]).map { |string| string.read_string() }
 			@data_version = raw_state[:version].read_array_of_type(::FFI::TYPE_INT64, :read_int64, raw_state[:version_length])  if not raw_state[:version].null?
-			@data = MessagePack.unpack(raw_state[:raw].read_string_length(raw_state[:raw_length]))  if not raw_state[:raw].null?
+			serialized_data_type = raw_state[:data_type].read_array_of_pointer(raw_state[:data_type_length]).map { |string| string.read_string() }
+			@data_type, @data = deserializer.call(serialized_data_type, raw_state[:raw].read_string_length(raw_state[:raw_length]))  if not raw_state[:raw].null?
 			ObjectSpace.define_finalizer(self, ObjectObserveState.finalize(@raw_state))
 		end
 
@@ -339,8 +388,8 @@ module Hakuban
 
 		attr_reader :descriptor
 
-		def initialize(local_node, descriptor)
-			@local_node, @descriptor = local_node, descriptor
+		def initialize(local_node, descriptor, deserializer)
+			@local_node, @descriptor, @deserializer = local_node, descriptor, deserializer
 			result = FFI::hakuban_tag_observe_new(@local_node.local_node_pointer, @descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
 			@tag_observe_pointer = ::FFI::AutoPointer.new(result[:tag_observe_pointer], FFI::method(:hakuban_tag_observe_drop))
@@ -360,7 +409,7 @@ module Hakuban
 			result = FFI::hakuban_tag_observe_object_state_borrow(@tag_observe_pointer, object_descriptor.to_ffi)
 			return nil  if result[:error] == 4
 			Hakuban::raise_if_error(result)
-			ObjectObserveState.new(result[:state])
+			ObjectObserveState.new(result[:state], @deserializer)
 		end
 
 		def send_events_to(*params)
@@ -400,8 +449,8 @@ module Hakuban
 
 		attr_reader :descriptor
 		
-		def initialize(local_node, descriptor)
-			@local_node, @descriptor = local_node, descriptor
+		def initialize(local_node, descriptor, serializer)
+			@local_node, @descriptor, @serializer = local_node, descriptor, serializer
 			result = FFI::hakuban_tag_expose_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
 			@tag_expose_pointer = ::FFI::AutoPointer.new(result[:tag_expose_pointer], FFI::method(:hakuban_tag_expose_drop))
@@ -416,11 +465,10 @@ module Hakuban
 			ret
 		end
 		
-		def set_object_state(object_descriptor, version, data_type, data)
+		def set_object_state(object_descriptor, version, data, data_type = [])
 			raise "Attempt to use after 'drop'"  if not @tag_expose_pointer
-			data_type = ["MessagePack"] + data_type
-			serialized = MessagePack.pack(data)
-			result = FFI::hakuban_tag_expose_object_state(@tag_expose_pointer, object_descriptor.to_ffi, FFI::FFIObjectExposeState.construct(version, data_type, serialized))
+			serialized_data_type, serialized_data = @serializer.call(data_type, data)
+			result = FFI::hakuban_tag_expose_object_state(@tag_expose_pointer, object_descriptor.to_ffi, FFI::FFIObjectExposeState.construct(version, serialized_data_type, serialized_data))
 			Hakuban::raise_if_error(result)
 			result[:changed] == 1
 		end
@@ -487,12 +535,6 @@ module Hakuban
 			@websocket_connector_pointer = ::FFI::AutoPointer.new(result[:websocket_connector_pointer], WebsocketConnector.generate_drop)
 		end
 
-		def start(local_node)
-			@local_node = local_node
-			FFI::hakuban_tokio_websocket_connector_start(Tokio.pointer, @websocket_connector_pointer, @local_node.local_node_pointer)
-			self
-		end
-
 		def self.generate_drop
 			proc { |pointer|
 				FFI::hakuban_tokio_websocket_connector_drop(Tokio.pointer, pointer)
@@ -504,7 +546,7 @@ module Hakuban
 
 	# convenience utils
 
-	#TODO: replace this mess (<Hash, dynamic mixings) with some "deref"
+	#TODO: replace this mess (<Hash, dynamic mixins) with some "deref"
 	class ObjectManager < Hash
 
 		module ObservedObjectManager
@@ -594,10 +636,11 @@ module Hakuban
 		end
 
 
-		class ManagedObject
+		class ManagedObject < OpenStruct
 			attr_reader :contract, :descriptor
 			def initialize(contract, descriptor)
 				@contract, @descriptor = contract, descriptor
+				super()
 			end
 		end	
 
@@ -621,7 +664,7 @@ module Hakuban
 
 		class ExposedObject < ManagedObject
 			def state_set(state)
-				if @contract.method(:set_object_state).arity == 4
+				if @contract.method(:set_object_state).arity == -4
 					@contract.set_object_state(@descriptor, *state)
 				else
 					@contract.set_object_state(*state)
@@ -632,10 +675,10 @@ module Hakuban
 			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)
+				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)
+					@contract.set_object_state([1, timestamp.floor, ((timestamp - timestamp.floor)*1000000000).floor, 0],value)
 				end
 			end
 			def data=(value)

data/lib/hakuban/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec