async-tools 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3b08f9b120bebf744df3e7c0da6e2cb7c8d4c5acb01458c25f8be8ff7588fa
-  data.tar.gz: 7c02d0bfce7a3bcb21b8ac8b2f4a8aec4bfad5a12233141b7d1d73b139c08684
+  metadata.gz: 47081e302bddc4861bc4526016dd26f4f601014d24b6696427b100446704b6b3
+  data.tar.gz: 6b71e93bbdbb81df60b5e20b0323a514759c1ab4e974c28a339cf8979fcc3d82
 SHA512:
-  metadata.gz: 496680113c44a54745da6846bca478f426454eaa34c125de569205c9f5fe3bc82ec6fe53589f8c86c0b1222361ec949c7938baa64b2be0246a15da280ca8f30a
-  data.tar.gz: 14d6d23403ede1040d74e68590ad0572e1c01b402ff6d7d0ff25dfb11c6f0f7a187b894c5681772e7828c88a8ba5f2e95751a3bce58ba9d9dc2aa14c31078e67
+  metadata.gz: a0636dd84879123e42e22599289ceb3f474f14a7ebdf32abe379ad02d7ac7b4e6f1dafbe54a96686d37bbfa0428b0bc7950c975f3b20c37c89c80c6b8e46cad0
+  data.tar.gz: 8045ea3c5c51d63b7ccd7349697af0c7f34c7ce937c11d0d65a76b154b5ca04bf37aee70a21261901e770c805bb7b487def5915f2def9193f8488e8dc1136a28

data/Gemfile

@@ -7,6 +7,9 @@ gemspec
 
 gem "rake"
 
+# optional
+gem "activesupport"
+
 gem "async-http"
 gem "async-rspec"
 gem "rspec"

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    async-tools (0.2.2)
+    async-tools (0.2.5)
       async (~> 2.3)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.0.4.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
     async (2.3.1)
       console (~> 1.10)
@@ -32,12 +37,15 @@ GEM
     backport (1.2.0)
     benchmark (0.2.1)
     childprocess (4.1.0)
+    concurrent-ruby (1.2.2)
     console (1.16.2)
       fiber-local
     diff-lcs (1.5.0)
     docile (1.4.0)
     e2mmap (0.1.0)
     fiber-local (1.0.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     io-event (1.1.6)
     jaro_winkler (1.5.4)
@@ -46,6 +54,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    minitest (5.18.0)
     nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     overcommit (0.60.0)
@@ -134,6 +143,8 @@ GEM
     tilt (2.0.11)
     timers (4.3.5)
     traces (0.8.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
     webrick (1.7.0)
     yard (0.9.28)
@@ -144,6 +155,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activesupport
   async-http
   async-rspec
   async-tools!

data/lib/async/app/component.rb

@@ -4,18 +4,8 @@ module Async::App::Component
   def self.included(base)
     base.extend(Async::App::Injector)
     base.inject(:bus)
-
     base.include(Async::Logger)
-
-    strict = Dry.Types::Strict
-
-    string_like = (strict::String | strict::Symbol).constructor(&:to_s)
-    kv = strict::Hash.map(string_like, strict::String)
-
-    base.const_set(:T, Module.new do
-      include Dry.Types
-      const_set(:StringLike, string_like)
-      const_set(:KV, kv)
-    end)
   end
+
+  def run = nil
 end

data/lib/async/app/event_logger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Async::App::EventLogger
+  include Async::App::Component
+
+  def run
+    bus.subscribe(/.*/) do |name, payload|
+      debug { "Event #{name} received. Payload:\n\n#{payload.pretty_inspect}\n" }
+    end
+  end
+end

data/lib/async/app.rb

@@ -15,11 +15,9 @@ class Async::App
     @task = Async::Task.current
 
     set_traps!
-    {
-      bus: Async::Bus.new(app_name),
-      **container_config
-    }.each { container.register(_1, _2) }
+    init_container!
 
+    start_event_logger!
     start_metrics_server!
     run!
     info { "Started" }
@@ -53,6 +51,13 @@ class Async::App
     trap("TERM") { stop }
   end
 
+  def init_container!
+    {
+      bus: Async::Bus.new,
+      **container_config
+    }.each { container.register(_1, _2) }
+  end
+
   def force_exit!
     fatal { "Forced exit" }
     exit(1)
@@ -63,4 +68,6 @@ class Async::App
       bus.subscribe("metrics.updated") { server.update_metrics(_1) }
     end
   end
+
+  def start_event_logger! = EventLogger.new.run
 end

data/lib/async/bus.rb

@@ -2,30 +2,20 @@
 
 class Async::Bus
   include Async::Logger
-  # dry-events is not a dependency of async-tools on purpose.
-  # add it to your bundle yourself
-
-  # Semantics:
-  # - Lazily registeres events
-  # - Synchronous by default
-  # - Catches exceptions in subscribers, logs them
-  def initialize(name)
-    @name = name
-    @w = Class.new.include(Dry::Events::Publisher[name]).new
-  end
+  # A tiny wrapper around ac ActiveSupport::Notifications
 
   # BLOCKING unless subscribers run in tasks
   def publish(name, *args, **params)
-    @w.register_event(name)
-    @w.publish(name, payload: (args.first || params))
+    ActiveSupport::Notifications.instrument(name, payload: (args.first || params))
   rescue StandardError => e
     log_error(name, e)
   end
 
   # NON-BLOCKING
-  def subscribe(name)
-    @w.register_event(name)
-    @w.subscribe(name) { yield(_1[:payload]) }
+  def subscribe(pattern)
+    ActiveSupport::Notifications.subscribe(pattern) do |name, _start, _finish, _id, params|
+      yield params[:payload], name
+    end
   end
 
   # NON-BLOCKING, runs subscriber in a task

data/lib/async/cache.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Async::Cache
+  Item = Struct.new("Item", :task, :value, :created_at, :duration) do
+    def expired? = created_at && Time.now - created_at >= duration
+  end
+
+  def cache(id, duration:, parent: Async::Task.current)
+    cleanup!
+    find_or_create(id, duration:) do |item|
+      parent.async do |task|
+        item.task = task
+        item.value = yield(id) if block_given?
+        item.created_at = Time.now
+      end.wait
+    end.value
+  end
+
+  def cleanup! = storage.delete_if { _2.expired? }
+  def count = storage.count
+
+  private
+
+  def find_or_create(id, duration:)
+    storage[id].tap do |item|
+      item.duration = duration
+      item.task&.wait
+      return item if item.created_at
+
+      yield(item)
+    end
+  end
+
+  def storage = @storage ||= Hash.new { _1[_2] = Item.new }
+end

data/lib/async/throttler.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# inspired by https://github.com/negativecode/vines/blob/master/lib/vines/token_bucket.rb
+class Async::Throttler
+  def initialize(capacity, rate, parent: Async::Task.current)
+    raise ArgumentError, "capacity must be > 0" unless capacity.positive?
+    raise ArgumentError, "rate must be > 0" unless rate.positive?
+
+    @capacity = capacity
+    @tokens = capacity
+    @rate = rate
+    @parent = parent
+
+    @timestamp = Time.new
+  end
+
+  def wait(timeout: 0)
+    with_timeout(timeout) do
+      while @tokens < 1
+        fill!
+        sleep(1.0 / @rate)
+      end
+    end
+
+    @tokens -= 1
+  end
+
+  def async(parent: @parent, timeout: 0, &)
+    wait(timeout:)
+    parent.async(&)
+  end
+
+  private
+
+  def with_timeout(timeout, &)
+    return yield if timeout.zero?
+
+    Fiber.scheduler.with_timeout(timeout, &)
+  end
+
+  def fill!
+    return if @tokens >= @capacity
+
+    now = Time.new
+    @tokens += @rate * (now - @timestamp)
+    @tokens = @capacity if @tokens > @capacity
+    @timestamp = now
+  end
+end

data/lib/async/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Async # rubocop:disable Style/ClassAndModuleChildren
   module Tools
-    VERSION = "0.2.2"
+    VERSION = "0.2.5"
   end
 end

data/lib/async/tools.rb

@@ -22,9 +22,11 @@ module Async
     end
   end
 
-  def self.map(collection, **params, &)
-    WorkerPool.with(queue_limit: collection.count, **params) do |pool|
-      pool.schedule_all(collection, &).map(&:wait)
+  def self.map(collection, concurrency: nil, parent: Async::Task.current, &)
+    Async::Semaphore.new(concurrency || collection.count, parent:).then do |s|
+      collection.map do |item|
+        s.async { yield(item) }
+      end.map(&:wait)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -62,16 +62,19 @@ files:
 - bin/setup
 - lib/async/app.rb
 - lib/async/app/component.rb
+- lib/async/app/event_logger.rb
 - lib/async/app/injector.rb
 - lib/async/app/metrics/ruby_runtime_monitor.rb
 - lib/async/app/metrics/serializer.rb
 - lib/async/app/metrics/server.rb
 - lib/async/app/metrics/store.rb
 - lib/async/bus.rb
+- lib/async/cache.rb
 - lib/async/channel.rb
 - lib/async/logger.rb
 - lib/async/q.rb
 - lib/async/result_notification.rb
+- lib/async/throttler.rb
 - lib/async/timer.rb
 - lib/async/tools.rb
 - lib/async/tools/version.rb