sandbox-provider 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012300e69a3b0389101f1d843340008aab5e7cc0ef0173227187e7a0f889ec52
-  data.tar.gz: 10e39f638d1aec981f651a0ed391a07834fbb0a900944ae8ddcff6996a726cea
+  metadata.gz: c4be6ee4a326cae728dfa5986e371fb23a3b51a34646c3fc26d0c79e95647a7b
+  data.tar.gz: fd8ec5fda4686750696ea0e7ea14bdc317eeef2a90b6156ccee3c5ee91595e3b
 SHA512:
-  metadata.gz: 12d574beb0f49b05519c9ff95fae5de37d5c54baf0fa034b1d0d64d138e99d6925531ea48d449e02d7ca4adbfe4a7d64597067a750e73b57a358de96388d66e5
-  data.tar.gz: 7370726a28469cf76d5d55d55a20fc226928bea484e9739be9cba51f6e88bc32ab0b75b4787f6ce421f8486bd2ee22d27fcd1c354e78a434885c7c5436286f4d
+  metadata.gz: f874cc33545840d4a68b082858285aa9824f61743db170c38fa82a7b208ed646028be1750069f4a77a38707c306d54ebd52c191fd6b0f9a79d8f7c01beb9bbc5
+  data.tar.gz: 8b6d3e75a0e01167d9a83950b0d481abbf2267e3491283cdb82f84137594d441b971c1dab46c7182addd9c8a1fa87fc2482ddc95749f5c0e90e03e10d460fdde

data/lib/sandbox/provider/daytona/link.rb

@@ -0,0 +1,59 @@
+# An SSH transport whose token another process can revoke by minting a new one. A command refused before
+# it printed anything is tried once more with the store's current token.
+class Sandbox::Provider::Daytona::Link
+  RETRY = [ *Sandbox::Adapter::Ssh::CONNECTION_ERRORS, Net::SSH::AuthenticationFailed ].freeze
+
+  def initialize(access, host_key: nil, on_host_key: nil)
+    @access = access
+    @host_key = host_key
+    @on_host_key = on_host_key
+    @ssh = build(access.call(nil))
+  end
+
+  def address = @ssh.address
+  def host = @ssh.host
+  def port = @ssh.port
+  def user = @ssh.user
+  def key = @ssh.key
+  def connection_errors = Sandbox::Adapter::Ssh::CONNECTION_ERRORS
+  def reattaches? = true
+
+  def exec(command, &block)
+    printed = false
+    begin
+      @ssh.exec(command) do |line|
+        printed = true
+        block&.call(line)
+      end
+    rescue *RETRY
+      raise if printed
+
+      refresh
+      @ssh.exec(command, &block)
+    end
+  end
+
+  def upload(path, io)
+    @ssh.upload(path, io)
+  rescue *RETRY
+    io.rewind if io.respond_to?(:rewind)
+    refresh
+    @ssh.upload(path, io)
+  end
+
+  def download(path)
+    @ssh.download(path)
+  rescue *RETRY
+    refresh
+    @ssh.download(path)
+  end
+
+  private
+
+    def refresh = @ssh = build(@access.call(@ssh.user))
+
+    def build(access)
+      Sandbox::Adapter::Ssh.new(host: access.host, port: access.port, user: access.token, key: nil,
+                                host_key: @host_key, on_host_key: ->(key) { @host_key = key; @on_host_key&.call(key) })
+    end
+end

data/lib/sandbox/provider/daytona.rb

@@ -15,9 +15,25 @@ class Sandbox::Provider::Daytona < Sandbox::Adapter::SandboxVm
   # An SSH token and where it lands, good until `until`.
   Access = Data.define(:host, :port, :token, :until)
   # One token per sandbox, kept until it nears expiry: minting a new one revokes the previous, so every
-  # transport to the same sandbox (root or the deploy user) shares it. A fork gets its own.
-  TOKENS = {}
-  TOKENS_LOCK = Mutex.new
+  # transport to the same sandbox shares it, across processes when the store is shared. A fork gets its own.
+  # A store answers read(id), write(id, access), delete(id) and synchronize(id) { }.
+  class Tokens
+    def initialize
+      @tokens = {}
+      @lock = Monitor.new
+    end
+
+    def read(id) = @tokens[id]
+    def write(id, access) = @tokens[id] = access
+    def delete(id) = @tokens.delete(id)
+    def synchronize(_id, &) = @lock.synchronize(&)
+  end
+
+  class << self
+    attr_writer :tokens
+
+    def tokens = @tokens ||= Tokens.new
+  end
 
   def initialize(token, client: Client.new(token), **)
     super(token, **)
@@ -150,7 +166,7 @@ to: Time.current.utc.iso8601 })
 
   # A parent with live forks cannot go: the error says so.
   def destroy(m)
-    TOKENS_LOCK.synchronize { TOKENS.delete(m.id) }
+    self.class.tokens.synchronize(m.id) { self.class.tokens.delete(m.id) }
     @client.delete("/sandbox/#{m.id}", force: true)
   rescue Error => e
     raise unless e.status == 404
@@ -165,19 +181,18 @@ to: Time.current.utc.iso8601 })
   end
 
   def transport(m, key: nil, host_key: nil, on_host_key: nil)
-    access = TOKENS_LOCK.synchronize do
-      kept = TOKENS[m.id]
-      kept = nil if kept.nil? || kept.until < Time.current
-      kept || (TOKENS[m.id] = mint(m.id))
+    Link.new(-> (stale) { access(m.id, stale:) }, host_key:, on_host_key:)
+  end
+
+  # The sandbox's token from the store, minted when there is none, it nears expiry, or it is `stale`: the
+  # one a refused connection used. Another process may have replaced it already; then that one is kept.
+  def access(id, stale: nil)
+    tokens = self.class.tokens
+    tokens.synchronize(id) do
+      kept = tokens.read(id)
+      kept = nil if kept.nil? || kept.until < Time.current || kept.token == stale
+      kept || mint(id).tap { |minted| tokens.write(id, minted) }
     end
-    Sandbox::Adapter::Ssh.new(
-      host: access.host,
-      port: access.port,
-      user: access.token,
-      key: nil,
-      host_key:,
-      on_host_key:
-    )
   end
 
   # Their preview link for the port: a host at their edge and a token it wants in a header. The token rotates

data/lib/sandbox/provider/version.rb

@@ -1,5 +1,5 @@
 module Sandbox
   module Provider
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/sandbox-provider.rb

@@ -12,6 +12,7 @@ require_relative "sandbox/provider/hetzner"
 require_relative "sandbox/provider/hetzner/client"
 require_relative "sandbox/provider/daytona"
 require_relative "sandbox/provider/daytona/client"
+require_relative "sandbox/provider/daytona/link"
 require_relative "sandbox/provider/e2b"
 require_relative "sandbox/provider/e2b/client"
 require_relative "sandbox/provider/e2b/envd"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandbox-provider
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nvoi
@@ -52,6 +52,7 @@ files:
 - lib/sandbox/provider/cloud_init.rb
 - lib/sandbox/provider/daytona.rb
 - lib/sandbox/provider/daytona/client.rb
+- lib/sandbox/provider/daytona/link.rb
 - lib/sandbox/provider/e2b.rb
 - lib/sandbox/provider/e2b/client.rb
 - lib/sandbox/provider/e2b/envd.rb