terminalwire 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eacca5d9e410385fee49a9115cdc9d92ac1276b0666af88b8c343f11306a05f
-  data.tar.gz: c94050aef56399743f202c13c3813bb66a05cfffd2333ea9431bccded43234f2
+  metadata.gz: 1961141ea3c3667bbff1f44be8f95ce247128f9c41fe7c98b0f96bb4b1c5099e
+  data.tar.gz: e206f7d31c8632a5e25a9d8e2d5e4eb974927450c463abb7f474887d07b7c1a1
 SHA512:
-  metadata.gz: 2a25a33121a603fdcb11c5c664d17772f999d4a379379390ad578ed434fa75428f45deda6d2023e490ecf2bedfad61cf58a9fd4d7c880e17fff714978075159c
-  data.tar.gz: 76e5bf2edd88ad0ca092328514ebce7bc22ee64ff13aa4ebf83c77319849fe2564515cc89bf27364f3135ca2456143869066ca6eaef70daae15dabedb006b3e3
+  metadata.gz: 765fb306bb7c354511db2c0e6be9641c91d9207bbf2a97bcc6a0e67b039ab785061be38b0acc4ebea8a9784e43b3f211acefe9cda3200ed16dce1d14b95ce3f8
+  data.tar.gz: 3d2ebd1e83bdc9bd6fa742b2ebc496fc871ead16bf43a487c47d236ac18a863494542c0fcb5cbea6bf9c3f366fbffe5c374a49c054b96463d134912329c243a4

data/lib/terminalwire/client/entitlement.rb

@@ -1,5 +1,5 @@
 module Terminalwire::Client
-  class Entitlement
+  module Entitlement
     class Paths
       include Enumerable
 
@@ -55,53 +55,89 @@ module Terminalwire::Client
       end
     end
 
-    attr_reader :paths, :authority, :schemes
+    class Policy
+      attr_reader :paths, :authority, :schemes
 
-    def initialize(authority:)
-      @authority = authority
-      @paths = Paths.new
+      ROOT_PATH = "~/.terminalwire".freeze
 
-      # Permit the domain directory. This is necessary for basic operation of the client.
-      @paths.permit storage_path
-      @paths.permit storage_pattern
+      def initialize(authority:)
+        @authority = authority
+        @paths = Paths.new
 
-      @schemes = Schemes.new
-      # Permit http & https by default.
-      @schemes.permit "http"
-      @schemes.permit "https"
-    end
+        # Permit the domain directory. This is necessary for basic operation of the client.
+        @paths.permit storage_path
+        @paths.permit storage_pattern
 
-    def domain_path
-      Pathname.new("~/.terminalwire/authorities/#{@authority}").expand_path
-    end
+        @schemes = Schemes.new
+        # Permit http & https by default.
+        @schemes.permit "http"
+        @schemes.permit "https"
+      end
 
-    def storage_path
-      domain_path.join("storage")
-    end
+      def root_path
+        Pathname.new(ROOT_PATH)
+      end
+
+      def authority_path
+        root_path.join("authorities/#{authority}")
+      end
+
+      def storage_path
+        authority_path.join("storage")
+      end
 
-    def storage_pattern
-      storage_path.join("**/*")
+      def storage_pattern
+        storage_path.join("**/*")
+      end
+
+      def serialize
+        {
+          authority: @authority,
+          schemes: @schemes.serialize,
+          paths: @paths.serialize,
+          storage_path: storage_path.to_s,
+        }
+      end
     end
 
-    def serialize
-      {
-        authority: @authority,
-        schemes: @schemes.serialize,
-        paths: @paths.serialize,
-        storage_path: storage_path.to_s,
-      }
+    class RootPolicy < Policy
+      HOST = "terminalwire.com".freeze
+
+      def initialize(*, **, &)
+        # Make damn sure the authority is set to Terminalwire.
+        super(*, authority: HOST, **, &)
+
+        # Now setup special permitted paths.
+        @paths.permit root_path
+        @paths.permit root_pattern
+      end
+
+      # Grant access to the `~/.terminalwire/**/*` path so users can install
+      # terminalwire apps via `terminalwire install svbtle`, etc.
+      def root_pattern
+        root_path.join("**/*")
+      end
     end
 
     def self.from_url(url)
+      url = URI(url)
+
+      case url.host
+      when RootPolicy::HOST
+        RootPolicy.new
+      else
+        Policy.new authority: url_authority(url)
+      end
+    end
+
+    def self.url_authority(url)
       # I had to lift this from URI::HTTP because `ws://` doesn't
       # have an authority method.
-      authority = if url.port == url.default_port
+      if url.port == url.default_port
         url.host
       else
         "#{url.host}:#{url.port}"
       end
-
-      new authority:
     end
   end
 end

data/lib/terminalwire/client.rb

@@ -73,16 +73,19 @@ module Terminalwire
       end
     end
 
-    def self.websocket(url:, arguments: ARGV)
+    def self.websocket(url:, arguments: ARGV, entitlement: nil)
       url = URI(url)
 
       Async do |task|
-        endpoint = Async::HTTP::Endpoint.parse(url)
+        endpoint = Async::HTTP::Endpoint.parse(
+          url,
+          alpn_protocols: Async::HTTP::Protocol::HTTP11.names
+        )
 
         Async::WebSocket::Client.connect(endpoint) do |adapter|
           transport = Terminalwire::Transport::WebSocket.new(adapter)
           adapter = Terminalwire::Adapter.new(transport)
-          entitlement = Entitlement.from_url(url)
+          entitlement ||= Entitlement.from_url(url)
           Terminalwire::Client::Handler.new(adapter, arguments:, entitlement:).connect
         end
       end

data/lib/terminalwire/thor.rb

@@ -36,6 +36,10 @@ module Terminalwire
             :puts, :print
           def_delegators :stdin,
             :gets
+
+          # Feels more naturual to call `client.files` etc. from
+          # the serve since it's more apparent that it's a client.
+          alias :client :context
         end
       end
     end

data/lib/terminalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terminalwire
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ship a CLI for your web app. No API required.