terminalwire 0.1.1 → 0.1.2

data/lib/terminalwire.rb

@@ -3,17 +3,10 @@
 require_relative "terminalwire/version"
 
 require 'socket'
-require 'msgpack'
-require 'launchy'
-require 'logger'
-require 'io/console'
 require 'forwardable'
 require 'uri'
 require 'zeitwerk'
 
-require 'thor'
-require 'fileutils'
-
 require 'async'
 require 'async/http/endpoint'
 require 'async/websocket/client'
@@ -27,123 +20,35 @@ module Terminalwire
     loader.setup
   end
 
-  module Logging
-    DEVICE = Logger.new($stdout, level: ENV.fetch("LOG_LEVEL", "info"))
-    def logger = DEVICE
-  end
-
-  class Connection
-    include Logging
-
-    attr_reader :transport
-
-    def initialize(transport)
-      @transport = transport
-    end
-
-    def write(data)
-      logger.debug "Connection: Sending #{data.inspect}"
-      packed_data = MessagePack.pack(data, symbolize_keys: true)
-      @transport.write(packed_data)
-    end
-
-    def recv
-      logger.debug "Connection: Reading"
-      packed_data = @transport.read
-      return nil if packed_data.nil?
-      data = MessagePack.unpack(packed_data, symbolize_keys: true)
-      logger.debug "Connection: Recieved #{data.inspect}"
-      data
-    end
-
-    def close
-      @transport.close
-    end
-  end
-
-  class ResourceRegistry
-    def initialize
-      @resources = Hash.new
-    end
-
-    def register(name, to: nil)
-      @resources[name.to_s] = to
-    end
-
-    def <<(resource_class)
-      register resource_class.protocol_key, to: resource_class
-    end
-
-    def find(name)
-      @resources.fetch(name.to_s)
-    end
-  end
-
   module Resource
     class Base
-      attr_reader :id, :connection
+      attr_reader :name, :adapter
 
-      def initialize(id, connection)
-        @id = Integer(id)
-        @connection = connection
+      def initialize(name, adapter)
+        @name = name.to_s
+        @adapter = adapter
       end
 
       def connect; end
-      def dispatch(action, data); end
       def disconnect; end
 
-      def respond(response, status: :success)
-        connection.write(event: "device", id: @id, status:, response:)
+      def fail(response, **data)
+        respond(status: "failure", response:, **data)
       end
 
-      def self.protocol_key
-        name.split("::").last.downcase
+      def succeed(response, **data)
+        respond(status: "success", response:, **data)
       end
-    end
-  end
-
-  module WebSocket
-    class Server
-      include Logging
 
-      def call(env)
-        Async::WebSocket::Adapters::Rack.open(env, protocols: ['ws']) do |connection|
-          run(Connection.new(Terminalwire::Transport::WebSocket.new(connection)))
-        end or [200, { "Content-Type" => "text/plain" }, ["Connect via WebSockets"]]
+      def self.protocol_key
+        name.split("::").last.downcase
       end
 
       private
 
-      def run(connection)
-        while message = connection.recv
-          puts message
-        end
-      end
-    end
-
-    class ThorServer < Server
-      include Logging
-
-      def initialize(cli_class)
-        @cli_class = cli_class
-
-        # Check if the Terminalwire::Thor module is already included
-        unless @cli_class.included_modules.include?(Terminalwire::Thor)
-          raise 'Add `include Terminalwire::Thor` to the #{@cli_class.inspect} class.'
-        end
-      end
-
-      def run(connection)
-        logger.info "ThorServer: Running #{@cli_class.inspect}"
-        while message = connection.recv
-          case message
-          in { event: "initialize", protocol: { version: _ }, arguments:, program_name: }
-            Terminalwire::Server::Session.new(connection: connection) do |session|
-              @cli_class.start(arguments, session: session)
-            end
-          end
-        end
+      def respond(**response)
+        adapter.write(event: "resource", name: @name, **response)
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +157,13 @@ files:
 - lib/generators/terminalwire/install/templates/application_terminal.rb.tt
 - lib/generators/terminalwire/install/templates/bin/terminalwire
 - lib/terminalwire.rb
+- lib/terminalwire/adapter.rb
 - lib/terminalwire/client.rb
-- lib/terminalwire/client/binary.rb
+- lib/terminalwire/client/entitlement.rb
+- lib/terminalwire/client/exec.rb
+- lib/terminalwire/client/resource.rb
+- lib/terminalwire/logging.rb
+- lib/terminalwire/rails.rb
 - lib/terminalwire/server.rb
 - lib/terminalwire/thor.rb
 - lib/terminalwire/transport.rb
@@ -173,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Ship a CLI for your web app. No API required.