hakuban 0.6.5 → 0.7.0

data/lib/hakuban/stream.rb

@@ -0,0 +1,119 @@
+
+module Hakuban
+
+	module Stream
+
+		def each(*args,**kwargs,&block)
+			StreamEnumerator.new(self,false,false,false,args,kwargs).call_or_return(&block)
+		end
+
+		class KilledOnNext < Exception; end
+		
+		#TODO: meh
+		class StreamEnumerator
+
+			def initialize(stream, without_implicit_drop, async, kill_on_next, args, kwargs)
+				@stream, @without_implicit_drop, @async, @kill_on_next, @args, @kwargs = stream, without_implicit_drop, async, kill_on_next, args, kwargs
+			end
+
+			def async(*args,**kwargs,&block)
+				StreamEnumerator.new(@stream, @without_implicit_drop, :async, @kill_on_next, @args+args, @kwargs.merge(kwargs)).call_or_return(&block)
+			end
+
+			def thread(*args,**kwargs,&block)
+				StreamEnumerator.new(@stream, @without_implicit_drop, :thread, @kill_on_next, @args+args, @kwargs.merge(kwargs)).call_or_return(&block)
+			end
+			
+			def without_implicit_drop(*args,**kwargs,&block)
+				StreamEnumerator.new(@stream, true, @async, @kill_on_next, @args+args, @kwargs.merge(kwargs)).call_or_return(&block)
+			end
+
+			def kill_on_next(*args,**kwargs,&block)
+				StreamEnumerator.new(@stream, @without_implicit_drop, @async, true, @args+args, @kwargs.merge(kwargs)).call_or_return(&block)
+			end
+
+			def call_or_return(&block)
+				if block
+					Thread.handle_interrupt(Object => :never) {
+						begin
+							to_kill = nil
+							Thread.handle_interrupt(Object => :immediate) {
+								while new_item = @stream.next
+									case @async
+									when false
+										sync_call(new_item, block)
+									when :async
+										if @kill_on_next
+											if to_kill
+												to_kill.stop
+												to_kill.wait
+											end
+										end
+										to_kill = Async(new_item) { |_task, item|
+											sync_call(item, block)
+										}						
+									when :thread
+										if @kill_on_next
+											if to_kill
+												to_kill.raise KilledOnNext.new
+												to_kill.value 
+											end
+										end
+										to_kill = Thread.new(new_item) { |item|
+											sync_call(item, block)
+										}						
+									end
+								end
+
+								case @async
+								when false
+								when :async
+									if @kill_on_next
+										if to_kill
+											to_kill.stop
+											to_kill.wait
+										end
+									end
+								when :thread
+									if @kill_on_next
+										if to_kill
+											to_kill.raise KilledOnNext.new
+											to_kill.value 
+										end
+									end
+								end
+							}
+						ensure
+							#TODO: should we kill still-running sub-tasks here, or await? or maybe kill on exception, and await otherwise?
+						end
+					}
+				else
+					self
+				end
+			end
+
+			private def sync_call(item, block)
+				if @without_implicit_drop
+					begin
+						block.call(item, *@args, **@kwargs)
+					rescue KilledOnNext
+					end
+				else
+					Thread.handle_interrupt(Object => :never) {
+						begin
+							Thread.handle_interrupt(Object => :immediate) {
+								block.call(item, *@args, **@kwargs)
+							}
+						rescue KilledOnNext
+						ensure
+							item.drop
+						end
+					}
+				end
+			end
+
+		end
+
+	end
+
+end

data/lib/hakuban/tokio-websocket-connector.rb

@@ -0,0 +1,32 @@
+require 'hakuban/ffi-object.rb'
+
+module Hakuban
+
+	class Tokio
+
+		@@pointer = nil
+
+		def Tokio.init(workers_count=0)
+			Hakuban::hakuban_initialize
+			@@pointer ||= FFI::hakuban_tokio_init_multi_thread(0)
+		end
+
+		def Tokio.pointer
+			Tokio.init  if not @@pointer
+			@@pointer
+		end
+
+	end
+
+
+	class WebsocketConnector < FFIObject
+
+		def initialize(local_exchange, url, &block)
+			pointer = local_exchange.with_pointer { |local_exchange_pointer| FFI::hakuban_tokio_websocket_connector_new(Tokio.pointer, local_exchange_pointer, url) }.unwrap
+			initialize_pointer(pointer, :hakuban_tokio_websocket_connector_drop, nil)
+			self.do_and_drop_or_return(&block)
+		end
+
+	end
+
+end

data/lib/hakuban/version.rb

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

data/lib/hakuban.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
-require_relative "hakuban/version"
-require_relative "hakuban/hakuban"
-require_relative "hakuban/engine"
-#require_relative "hakuban/async"
-#require_relative "hakuban/thread"
-
 module Hakuban
+
+	def self.hakuban_initialize
+		require_relative 'hakuban/ffi.rb'
+	end
+
 end
+
+
+require_relative 'hakuban/contract.rb'
+require_relative 'hakuban/descriptor.rb'
+require_relative "hakuban/engine"
+require_relative 'hakuban/exchange.rb'
+require_relative 'hakuban/ffi-object.rb'
+require_relative 'hakuban/logger.rb'
+require_relative 'hakuban/object_state_sink.rb'
+require_relative 'hakuban/object_state_stream.rb'
+require_relative 'hakuban/object_state.rb'
+require_relative 'hakuban/tokio-websocket-connector.rb'
+require_relative "hakuban/version"
+
+
+#TODO: error classes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -71,23 +85,28 @@ email:
 - maciej.blomberg@mikoton.com
 executables:
 - hakuban-observer
-- hakuban-thread-engine
+- hakuban-engine
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bin/hakuban-engine
 - bin/hakuban-observer
-- bin/hakuban-thread-engine
 - lib/hakuban.rb
-- lib/hakuban/async.rb
+- lib/hakuban/contract.rb
+- lib/hakuban/descriptor.rb
 - lib/hakuban/engine.rb
-- lib/hakuban/event-queue.rb
+- lib/hakuban/exchange.rb
+- lib/hakuban/ffi-object.rb
 - lib/hakuban/ffi.rb
-- lib/hakuban/hakuban.rb
-- lib/hakuban/manager.rb
-- lib/hakuban/thread.rb
+- lib/hakuban/logger.rb
+- lib/hakuban/object_state.rb
+- lib/hakuban/object_state_sink.rb
+- lib/hakuban/object_state_stream.rb
+- lib/hakuban/stream.rb
+- lib/hakuban/tokio-websocket-connector.rb
 - lib/hakuban/version.rb
 homepage: https://gitlab.com/yunta/hakuban-ruby
 licenses:
@@ -108,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby binding for Hakuban library

data/lib/hakuban/async.rb

@@ -1,38 +0,0 @@
-require 'hakuban'
-require 'hakuban/manager'
-require 'async'
-
-module Hakuban
-
-	class AsyncObjectManager < ObjectManager
-
-		def async_run
-			Async { yield }
-		end
-
-		def async_join(task)
-			task.wait
-		end
-
-		def async_stop(task)
-			task.stop	
-		end
-
-		def async_filter_out_stop_exception
-			yield
-		rescue Async::Stop
-			nil
-		end
-		
-	end
-
-
-	class ObjectManagerBuilder
-	
-		def with_async(&block)
-			build(AsyncObjectManager, block)
-		end
-		
-	end
-
-end

data/lib/hakuban/event-queue.rb

@@ -1,75 +0,0 @@
-#TODO: rebuild to handle event squashing on rust side
-
-require 'ostruct'
-
-
-module Hakuban
-
-	class Event < OpenStruct; end
-
-	class ObjectDescriptorCallbackEventQueue
-
-		def initialize(pointer)
-			@events_pointer = ::FFI::AutoPointer.new(pointer, proc { |ptr| FFI.hakuban_object_descriptor_events_return(ptr) })
-		end
-
-
-		# WARNING: this callback may be run from a separate, non-ruby, thread
-		def callback_register(&callback)
-			ffi_callback = proc { |_userdata, ffi_descriptor, ffi_action|
-				action = Hakuban::action_int_to_symbol(ffi_action)
-				descriptor = ObjectDescriptor.from_ffi(ffi_descriptor)
-				callback.call(descriptor, action)
-			}
-			@callback_pointer = ::FFI::AutoPointer.new(
-				FFI::hakuban_object_descriptor_events_callback_register(@events_pointer, ffi_callback, ::FFI::Pointer::NULL),
-				proc { |ptr| FFI::hakuban_object_descriptor_events_callback_unregister(ptr) }
-			)
-		end
-
-
-		def callback_unregister
-			@callback_pointer.free
-			@callback_pointer = nil
-		end
-
-
-		def drop
-			@events_pointer.free
-			@events_pointer = nil
-		end
-
-	end
-
-
-	class ObjectDescriptorEventQueue
-
-		def initialize(contract)
-			@contract = contract
-			@queue = Queue.new
-			@ffi_callback = proc { |descriptor, action|
-				@queue << Hakuban::Event.new(action: action, descriptor: descriptor)
-			}
-			@ffi_events = @contract.new_callback_event_queue
-			@ffi_events.callback_register(&@ffi_callback)
-		end
-
-
-		#def push(event)
-		#	@queue << event
-		#end
-
-
-		def next_event; next_change; end
-		def next_change
-			@queue.pop
-		end
-		
-
-		def close
-			@queue.close
-		end
-
-	end
-
-end