terminal-shop 0.1.0.pre.alpha.10 → 0.1.0.pre.alpha.12

data/lib/terminal-shop/models/token_create_response.rb

@@ -2,12 +2,6 @@
 
 module TerminalShop
   module Models
-    # @example
-    # ```ruby
-    # token_create_response => {
-    #   data: TerminalShop::Models::TokenCreateResponse::Data
-    # }
-    # ```
     class TokenCreateResponse < TerminalShop::BaseModel
       # @!attribute data
       #
@@ -21,13 +15,6 @@ module TerminalShop
 
       # def initialize: (Hash | TerminalShop::BaseModel) -> void
 
-      # @example
-      # ```ruby
-      # data => {
-      #   id: String,
-      #   token: String
-      # }
-      # ```
       class Data < TerminalShop::BaseModel
         # @!attribute id
         #   Personal token ID.

data/lib/terminal-shop/models/token_delete_response.rb

@@ -2,12 +2,6 @@
 
 module TerminalShop
   module Models
-    # @example
-    # ```ruby
-    # token_delete_response => {
-    #   data: :ok
-    # }
-    # ```
     class TokenDeleteResponse < TerminalShop::BaseModel
       # @!attribute data
       #

data/lib/terminal-shop/models/token_get_response.rb

@@ -2,12 +2,6 @@
 
 module TerminalShop
   module Models
-    # @example
-    # ```ruby
-    # token_get_response => {
-    #   data: TerminalShop::Models::TokenAPI
-    # }
-    # ```
     class TokenGetResponse < TerminalShop::BaseModel
       # @!attribute data
       #   A personal access token used to access the Terminal API. If you leak this,

data/lib/terminal-shop/models/token_list_response.rb

@@ -2,12 +2,6 @@
 
 module TerminalShop
   module Models
-    # @example
-    # ```ruby
-    # token_list_response => {
-    #   data: -> { TerminalShop::ArrayOf[TerminalShop::Models::TokenAPI] === _1 }
-    # }
-    # ```
     class TokenListResponse < TerminalShop::BaseModel
       # @!attribute data
       #   List of personal access tokens.

data/lib/terminal-shop/models/view_init_response.rb

@@ -2,12 +2,6 @@
 
 module TerminalShop
   module Models
-    # @example
-    # ```ruby
-    # view_init_response => {
-    #   data: TerminalShop::Models::ViewInitResponse::Data
-    # }
-    # ```
     class ViewInitResponse < TerminalShop::BaseModel
       # @!attribute data
       #   Initial app data.
@@ -22,17 +16,6 @@ module TerminalShop
 
       # def initialize: (Hash | TerminalShop::BaseModel) -> void
 
-      # @example
-      # ```ruby
-      # data => {
-      #   addresses: -> { TerminalShop::ArrayOf[TerminalShop::Models::AddressAPI] === _1 },
-      #   apps: -> { TerminalShop::ArrayOf[TerminalShop::Models::AppAPI] === _1 },
-      #   cards: -> { TerminalShop::ArrayOf[TerminalShop::Models::CardAPI] === _1 },
-      #   cart: TerminalShop::Models::CartAPI,
-      #   orders: -> { TerminalShop::ArrayOf[TerminalShop::Models::OrderAPI] === _1 },
-      #   **_
-      # }
-      # ```
       class Data < TerminalShop::BaseModel
         # @!attribute addresses
         #

data/lib/terminal-shop/pooled_net_requester.rb

@@ -4,122 +4,167 @@ module TerminalShop
   # @private
   #
   class PooledNetRequester
-    def initialize
-      @mutex = Mutex.new
-      @pools = {}
+    class << self
+      # @private
+      #
+      # @param url [URI::Generic]
+      #
+      # @return [Net::HTTP]
+      #
+      def connect(url)
+        port =
+          case [url.port, url.scheme]
+          in [Integer, _]
+            url.port
+          in [nil, "http" | "ws"]
+            Net::HTTP.http_default_port
+          in [nil, "https" | "wss"]
+            Net::HTTP.https_default_port
+          end
+
+        Net::HTTP.new(url.host, port).tap do
+          _1.use_ssl = %w[https wss].include?(url.scheme)
+          _1.max_retries = 0
+        end
+      end
+
+      # @private
+      #
+      # @param conn [Net::HTTP]
+      # @param deadline [Float]
+      #
+      def calibrate_socket_timeout(conn, deadline)
+        timeout = deadline - TerminalShop::Util.monotonic_secs
+        (conn.open_timeout = timeout) unless conn.started?
+        conn.read_timeout = conn.write_timeout = conn.continue_timeout = timeout
+      end
+
+      # @private
+      #
+      # @param request [Hash{Symbol=>Object}] .
+      #
+      #   @option request [Symbol] :method
+      #
+      #   @option request [URI::Generic] :url
+      #
+      #   @option request [Hash{String=>String}] :headers
+      #
+      # @return [Net::HTTPGenericRequest]
+      #
+      def build_request(request)
+        method, url, headers, body = request.fetch_values(:method, :url, :headers, :body)
+        req = Net::HTTPGenericRequest.new(
+          method.to_s.upcase,
+          !body.nil?,
+          method != :head,
+          url.to_s
+        )
+
+        headers.each { req[_1] = _2 }
+
+        case body
+        in nil
+        in String
+          req.body = body
+        in StringIO
+          req.body = body.string
+        in IO
+          body.rewind
+          req.body_stream = body
+        end
+
+        req
+      end
     end
 
     # @private
     #
-    # @param url [URL::Generic]
+    # @param url [URI::Generic]
     # @param blk [Proc]
     #
-    # @return [ConnectionPool]
-    #
     private def with_pool(url, &blk)
       origin = TerminalShop::Util.uri_origin(url)
-      key = :"#{self.class.name}-connection_in_use_for_#{origin}"
+      th = Thread.current
+      key = :"#{object_id}-#{self.class.name}-connection_in_use_for_#{origin}"
 
-      return blk.call(make_conn(url)) if Thread.current[key]
+      if th[key]
+        tap do
+          conn = self.class.connect(url)
+          return blk.call(conn)
+        ensure
+          conn.finish if conn&.started?
+        end
+      end
 
       pool =
         @mutex.synchronize do
           @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
-            make_conn(url)
+            self.class.connect(url)
           end
         end
 
       pool.with do |conn|
-        Thread.current[key] = true
-
+        th[key] = true
         blk.call(conn)
-        # rubocop:disable Lint/RescueException
-      rescue Exception => e
-        # rubocop:enable Lint/RescueException
-        # should close connection on all errors to ensure no invalid state persists
-        conn.finish if conn.started?
-        raise e
       ensure
-        Thread.current[key] = nil
+        th[key] = nil
       end
     end
 
     # @private
     #
-    # @param url [URI::Generic]
+    # @param request [Hash{Symbol=>Object}] .
     #
-    # @return [Net::HTTP]
+    #   @option request [Symbol] :method
     #
-    private def make_conn(url)
-      port =
-        case [url.port, url.scheme]
-        in [Integer, _]
-          url.port
-        in [nil, "http" | "ws"]
-          Net::HTTP.http_default_port
-        in [nil, "https" | "wss"]
-          Net::HTTP.https_default_port
-        end
-
-      Net::HTTP.new(url.host, port).tap do
-        _1.use_ssl = %w[https wss].include?(url.scheme)
-        _1.max_retries = 0
-      end
-    end
-
-    # @private
-    #
-    # @param req [Hash{Symbol => Object}]
-    #   @option req [Symbol] :method
-    #   @option req [URI::Generic] :url
-    #   @option req [Hash{String => String}] :headers
-    #   @option req [String, Hash, IO, StringIO] :body
-    #   @option req [Float] :timeout
+    #   @option request [URI::Generic] :url
     #
-    # @return [Net::HTTPResponse]
+    #   @option request [Hash{String=>String}] :headers
     #
-    def execute(req)
-      method, url, headers, body, timeout = req.fetch_values(:method, :url, :headers, :body, :timeout)
-
-      request = Net::HTTPGenericRequest.new(
-        method.to_s.upcase,
-        !body.nil?,
-        method != :head,
-        url.to_s
-      )
-
-      headers.each { |k, v| request[k] = v }
-      case body
-      in String | nil
-        request.body = body
-      in IO | StringIO
-        request.body_stream = body
-      end
-
-      with_pool(url) do |conn|
-        make_request(conn, request, timeout)
-      end
-    end
-
-    # @private
+    #   @option request [Object] :body
     #
-    # @param conn [Net::HTTP]
-    # @param request [Net::HTTPGenericRequest]
-    # @param timeout [Float]
+    #   @option request [Float] :deadline
     #
-    # @return [Net::HTTPResponse]
+    # @return [Array(Net::HTTPResponse, Enumerable)]
     #
-    private def make_request(conn, request, timeout)
-      unless conn.started?
-        conn.open_timeout = timeout
-        conn.start
+    def execute(request)
+      url, deadline = request.fetch_values(:url, :deadline)
+      req = self.class.build_request(request)
+
+      eof = false
+      enum = Enumerator.new do |y|
+        with_pool(url) do |conn|
+          conn.start unless conn.started?
+          self.class.calibrate_socket_timeout(conn, deadline)
+
+          conn.request(req) do |rsp|
+            y << [conn, rsp]
+            rsp.read_body do |bytes|
+              y << bytes
+              self.class.calibrate_socket_timeout(conn, deadline)
+            end
+            eof = true
+          end
+        end
       end
 
-      conn.read_timeout = timeout
-      conn.write_timeout = timeout
-      conn.continue_timeout = timeout
+      # need to protect the `Enumerator` against `#.rewind`
+      fused = false
+      conn, response = enum.next
+      body = Enumerator.new do |y|
+        next if fused
 
-      conn.request(request)
+        fused = true
+        loop { y << enum.next }
+      ensure
+        conn.finish if !eof && conn.started?
+      end
+      [response, (response.body = body)]
+    end
+
+    def initialize
+      @mutex = Mutex.new
+      @pools = {}
     end
   end
 end

data/lib/terminal-shop/resources/app.rb

@@ -13,6 +13,8 @@ module TerminalShop
       #
       #   @option params [String] :redirect_uri Redirect URI of the app.
       #
+      #   @option params [String] :secret OAuth 2.0 client secret of the app (obfuscated).
+      #
       #   @option params [TerminalShop::RequestOptions, Hash{Symbol=>Object}, nil] :request_options
       #
       # @return [TerminalShop::Models::AppCreateResponse]

data/lib/terminal-shop/resources/subscription.rb

@@ -13,8 +13,6 @@ module TerminalShop
       #
       #   @option params [String] :card_id ID of the card used for the subscription.
       #
-      #   @option params [Symbol, TerminalShop::Models::SubscriptionAPI::Frequency] :frequency Frequency of the subscription.
-      #
       #   @option params [String] :product_variant_id ID of the product variant being subscribed to.
       #
       #   @option params [Integer] :quantity Quantity of the subscription.

data/lib/terminal-shop/util.rb

@@ -6,6 +6,48 @@ module TerminalShop
   # @private
   #
   module Util
+    # @private
+    #
+    # @return [String]
+    #
+    def self.arch
+      case (arch = RbConfig::CONFIG["arch"])&.downcase
+      in nil
+        "unknown"
+      in /aarch64|arm64/
+        "arm64"
+      in /x86_64/
+        "x64"
+      in /arm/
+        "arm"
+      else
+        "other:#{arch}"
+      end
+    end
+
+    # @private
+    #
+    # @return [String]
+    #
+    def self.os
+      case (host = RbConfig::CONFIG["host_os"])&.downcase
+      in nil
+        "Unknown"
+      in /linux/
+        "Linux"
+      in /darwin/
+        "MacOS"
+      in /freebsd/
+        "FreeBSD"
+      in /openbsd/
+        "OpenBSD"
+      in /mswin|mingw|cygwin|ucrt/
+        "Windows"
+      else
+        "Other:#{host}"
+      end
+    end
+
     # @private
     #
     # @param input [Object]
@@ -105,6 +147,12 @@ module TerminalShop
       end
     end
 
+    # @private
+    #
+    # @return [Float]
+    #
+    def self.monotonic_secs = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
     # @private
     #
     # @param exceptions [Array<Exception>]
@@ -384,6 +432,11 @@ module TerminalShop
           "transfer-encoding" => "chunked"
         }
         [headers, strio]
+      in [_, StringIO]
+        [headers, body.string]
+      in [_, IO]
+        headers = {**headers, "transfer-encoding" => "chunked"}
+        [headers, body]
       else
         [headers, body]
       end
@@ -391,24 +444,28 @@ module TerminalShop
 
     # @private
     #
-    # @param response [Net::HTTPResponse]
+    # @param headers [Hash{String=>String}, Net::HTTPHeader]
+    # @param stream [Enumerable]
     # @param suppress_error [Boolean]
     #
     # @raise [JSON::ParserError]
     # @return [Object]
     #
-    def self.decode_content(response, suppress_error: false)
-      case response.content_type
-      in "application/json"
+    def self.decode_content(headers, stream:, suppress_error: false)
+      case headers["content-type"]
+      in %r{^application/json}
+        json = stream.to_a.join
         begin
-          JSON.parse(response.body, symbolize_names: true)
+          JSON.parse(json, symbolize_names: true)
         rescue JSON::ParserError => e
           raise e unless suppress_error
-          response.body
+          json
         end
+      in %r{^text/}
+        stream.to_a.join
       else
         # TODO: parsing other response types
-        response.body
+        StringIO.new(stream.to_a.join)
       end
     end
 

data/lib/terminal-shop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerminalShop
-  VERSION = "0.1.0-alpha.10"
+  VERSION = "0.1.0-alpha.12"
 end

data/lib/terminal-shop.rb

@@ -7,6 +7,7 @@ require "erb"
 require "etc"
 require "json"
 require "net/http"
+require "rbconfig"
 require "securerandom"
 require "set"
 require "stringio"
@@ -17,94 +18,94 @@ require "uri"
 require "connection_pool"
 
 # Package files.
-require_relative "terminal-shop/pooled_net_requester"
 require_relative "terminal-shop/version"
 require_relative "terminal-shop/util"
 require_relative "terminal-shop/extern"
 require_relative "terminal-shop/base_model"
 require_relative "terminal-shop/base_page"
 require_relative "terminal-shop/request_options"
-require_relative "terminal-shop/base_client"
 require_relative "terminal-shop/errors"
-require_relative "terminal-shop/models/product"
-require_relative "terminal-shop/models/product_variant"
-require_relative "terminal-shop/models/product_list_response"
-require_relative "terminal-shop/models/profile"
-require_relative "terminal-shop/models/profile_update_response"
-require_relative "terminal-shop/models/profile_me_response"
+require_relative "terminal-shop/base_client"
+require_relative "terminal-shop/pooled_net_requester"
+require_relative "terminal-shop/client"
+require_relative "terminal-shop/models/app"
+require_relative "terminal-shop/models/subscription"
 require_relative "terminal-shop/models/address"
+require_relative "terminal-shop/models/address_create_params"
 require_relative "terminal-shop/models/address_create_response"
-require_relative "terminal-shop/models/address_list_response"
+require_relative "terminal-shop/models/address_delete_params"
 require_relative "terminal-shop/models/address_delete_response"
+require_relative "terminal-shop/models/address_list_params"
+require_relative "terminal-shop/models/address_list_response"
+require_relative "terminal-shop/models/app_create_params"
+require_relative "terminal-shop/models/app_create_response"
+require_relative "terminal-shop/models/app_delete_params"
+require_relative "terminal-shop/models/app_delete_response"
+require_relative "terminal-shop/models/app_get_params"
+require_relative "terminal-shop/models/app_get_response"
+require_relative "terminal-shop/models/app_list_params"
+require_relative "terminal-shop/models/app_list_response"
 require_relative "terminal-shop/models/card"
+require_relative "terminal-shop/models/card_collect_params"
+require_relative "terminal-shop/models/card_collect_response"
+require_relative "terminal-shop/models/card_create_params"
 require_relative "terminal-shop/models/card_create_response"
-require_relative "terminal-shop/models/card_list_response"
+require_relative "terminal-shop/models/card_delete_params"
 require_relative "terminal-shop/models/card_delete_response"
-require_relative "terminal-shop/models/card_collect_response"
+require_relative "terminal-shop/models/card_list_params"
+require_relative "terminal-shop/models/card_list_response"
 require_relative "terminal-shop/models/cart"
+require_relative "terminal-shop/models/cart_convert_params"
 require_relative "terminal-shop/models/cart_convert_response"
+require_relative "terminal-shop/models/cart_get_params"
 require_relative "terminal-shop/models/cart_get_response"
+require_relative "terminal-shop/models/cart_set_address_params"
 require_relative "terminal-shop/models/cart_set_address_response"
+require_relative "terminal-shop/models/cart_set_card_params"
 require_relative "terminal-shop/models/cart_set_card_response"
+require_relative "terminal-shop/models/cart_set_item_params"
 require_relative "terminal-shop/models/cart_set_item_response"
+require_relative "terminal-shop/models/email_create_params"
+require_relative "terminal-shop/models/email_create_response"
 require_relative "terminal-shop/models/order"
-require_relative "terminal-shop/models/order_list_response"
+require_relative "terminal-shop/models/order_get_params"
 require_relative "terminal-shop/models/order_get_response"
-require_relative "terminal-shop/models/subscription"
-require_relative "terminal-shop/models/subscription_create_response"
-require_relative "terminal-shop/models/subscription_list_response"
-require_relative "terminal-shop/models/subscription_delete_response"
-require_relative "terminal-shop/models/token"
-require_relative "terminal-shop/models/token_create_response"
-require_relative "terminal-shop/models/token_list_response"
-require_relative "terminal-shop/models/token_delete_response"
-require_relative "terminal-shop/models/token_get_response"
-require_relative "terminal-shop/models/app"
-require_relative "terminal-shop/models/app_create_response"
-require_relative "terminal-shop/models/app_list_response"
-require_relative "terminal-shop/models/app_delete_response"
-require_relative "terminal-shop/models/app_get_response"
-require_relative "terminal-shop/models/email_create_response"
-require_relative "terminal-shop/models/view_init_response"
+require_relative "terminal-shop/models/order_list_params"
+require_relative "terminal-shop/models/order_list_response"
+require_relative "terminal-shop/models/product"
 require_relative "terminal-shop/models/product_list_params"
-require_relative "terminal-shop/models/profile_update_params"
+require_relative "terminal-shop/models/product_list_response"
+require_relative "terminal-shop/models/product_variant"
+require_relative "terminal-shop/models/profile"
 require_relative "terminal-shop/models/profile_me_params"
-require_relative "terminal-shop/models/address_create_params"
-require_relative "terminal-shop/models/address_list_params"
-require_relative "terminal-shop/models/address_delete_params"
-require_relative "terminal-shop/models/card_create_params"
-require_relative "terminal-shop/models/card_list_params"
-require_relative "terminal-shop/models/card_delete_params"
-require_relative "terminal-shop/models/card_collect_params"
-require_relative "terminal-shop/models/cart_convert_params"
-require_relative "terminal-shop/models/cart_get_params"
-require_relative "terminal-shop/models/cart_set_address_params"
-require_relative "terminal-shop/models/cart_set_card_params"
-require_relative "terminal-shop/models/cart_set_item_params"
-require_relative "terminal-shop/models/order_list_params"
-require_relative "terminal-shop/models/order_get_params"
+require_relative "terminal-shop/models/profile_me_response"
+require_relative "terminal-shop/models/profile_update_params"
+require_relative "terminal-shop/models/profile_update_response"
 require_relative "terminal-shop/models/subscription_create_params"
-require_relative "terminal-shop/models/subscription_list_params"
+require_relative "terminal-shop/models/subscription_create_response"
 require_relative "terminal-shop/models/subscription_delete_params"
+require_relative "terminal-shop/models/subscription_delete_response"
+require_relative "terminal-shop/models/subscription_list_params"
+require_relative "terminal-shop/models/subscription_list_response"
+require_relative "terminal-shop/models/token"
 require_relative "terminal-shop/models/token_create_params"
-require_relative "terminal-shop/models/token_list_params"
+require_relative "terminal-shop/models/token_create_response"
 require_relative "terminal-shop/models/token_delete_params"
+require_relative "terminal-shop/models/token_delete_response"
 require_relative "terminal-shop/models/token_get_params"
-require_relative "terminal-shop/models/app_create_params"
-require_relative "terminal-shop/models/app_list_params"
-require_relative "terminal-shop/models/app_delete_params"
-require_relative "terminal-shop/models/app_get_params"
-require_relative "terminal-shop/models/email_create_params"
+require_relative "terminal-shop/models/token_get_response"
+require_relative "terminal-shop/models/token_list_params"
+require_relative "terminal-shop/models/token_list_response"
 require_relative "terminal-shop/models/view_init_params"
-require_relative "terminal-shop/client"
-require_relative "terminal-shop/resources/product"
-require_relative "terminal-shop/resources/profile"
+require_relative "terminal-shop/models/view_init_response"
 require_relative "terminal-shop/resources/address"
+require_relative "terminal-shop/resources/app"
 require_relative "terminal-shop/resources/card"
 require_relative "terminal-shop/resources/cart"
+require_relative "terminal-shop/resources/email"
 require_relative "terminal-shop/resources/order"
+require_relative "terminal-shop/resources/product"
+require_relative "terminal-shop/resources/profile"
 require_relative "terminal-shop/resources/subscription"
 require_relative "terminal-shop/resources/token"
-require_relative "terminal-shop/resources/app"
-require_relative "terminal-shop/resources/email"
 require_relative "terminal-shop/resources/view"

data/manifest.yaml

@@ -5,6 +5,7 @@ dependencies:
   - etc
   - json
   - net/http
+  - rbconfig
   - securerandom
   - set
   - stringio