lively 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0dda7cfa299aaa995ebe540f947ab24a4f2d0f3e8dab116e064f0af1d545075
-  data.tar.gz: 1ea180ab2040f3b5b7ae191fa4f731376e366b7cf658de422d2289d929078de6
+  metadata.gz: a673a59bd33ad2da10a565846eb708b9dc2390745e22a468763758ce8f6d3296
+  data.tar.gz: 4366967a33057ad99f803015799f63574f1fd2fc393053cd37f30dacd5881232
 SHA512:
-  metadata.gz: d2bc8606510afc7f5dd935bd46f3c2bb7613b9ba8a3301cb290f27b50aa5c14b65c670e09bf5a109fd41e0688542169997a7200295c64bfa9378ecf2bd685c9d
-  data.tar.gz: 327e99802f36ec9f354e5ad4195850e0e0ee7bfae7a9372b38f4442841500e7e94d80a13869096797e093da5ba8f5d37f04811dd801e854fb3f10e83127d9866
+  metadata.gz: e5bc31ac8e9c2dd9f7f3f400080de7d12b625a9795eea0601b03c2c5f5fde79a3d8bd1f185684655c2ada88ffe7f1113c9ec11c67a13969031bdaa14734644e3
+  data.tar.gz: b90a6057a65af77b8fb5221e6760893e78e7d39cc7e986180d0ea97ded8510130a7d372572bec213d74e1538f55fe43b61295ffad66464db949b980b04ee1b9d

data/bin/lively

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "async/service"
+require "async/container/threaded"
 require_relative "../lib/lively/environment/application"
 
 ARGV.each do |path|
@@ -11,7 +12,7 @@ end
 configuration = Async::Service::Configuration.build do
 	service "lively" do
 		include Lively::Environment::Application
-	end	
+	end
 end
 
-Async::Service::Controller.run(configuration)
+Async::Service::Controller.run(configuration, container_class: Async::Container::Threaded)

data/lib/lively/assets.rb

@@ -3,6 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2021-2025, by Samuel Williams.
 
+require "uri"
 require "protocol/http/middleware"
 require "protocol/http/body/file"
 require "console"

data/lib/lively/environment/application.rb

@@ -1,56 +1,68 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2025, by Samuel Williams.
+# Copyright, 2021-2026, by Samuel Williams.
 
-require_relative "../application"
-require_relative "../assets"
-
-require "falcon/environment/server"
+require_relative "middleware"
+require_relative "http"
+require_relative "htty"
 
 # @namespace
 module Lively
 	# @namespace
 	module Environment
-		# Represents the environment configuration for a Lively application server.
-		# 
-		# This module provides server configuration including URL binding, process count,
-		# application class resolution, and middleware stack setup. It integrates with
-		# Falcon's server environment to provide a complete hosting solution.
+		# Multiplexing environment for Lively applications.
+		#
+		# Declares the transport selection as explicit, overridable evaluator keys and uses `make_service` to compose the appropriate child environment at service startup time. This keeps transport selection in the service layer rather than in module inclusion hooks.
+		#
+		# The `htty` key controls which transport is used. Override it in a service block to force a specific transport regardless of the environment variable:
+		#
+		# ~~~ ruby
+		# service "myapp" do
+		#   include Lively::Environment::Application
+		#   def htty = false  # always use HTTP
+		# end
+		# ~~~
 		module Application
-			include Falcon::Environment::Server
+			include Lively::Environment::Middleware
+			# Note: does not include Falcon::Environment::Server directly. Falcon is
+			# brought in exclusively via http_environment so that the combined
+			# evaluator's service_class resolves correctly without shadowing.
+			
+			# Whether to use HTTY transport. Reads ENV["HTTY"] by default.
+			# @returns [Boolean]
+			def htty
+				ENV["HTTY"] == "1"
+			end
 			
-			# Get the server URL for this application.
-			# @returns [String] The base URL where the server will be accessible.
-			def url
-				"http://localhost:9292"
+			# The environment module to use for HTTY transport.
+			# @returns [Module]
+			def htty_environment
+				Lively::Environment::HTTY
 			end
 			
-			# Get the number of server processes to run.
-			# @returns [Integer] The number of worker processes.
-			def count
-				1
+			# The environment module to use for HTTP transport.
+			# @returns [Module]
+			def http_environment
+				Lively::Environment::HTTP
 			end
 			
-			# Resolve the application class to use.
-			# @returns [Class] The application class, either user-defined or default.
-			def application
-				if Object.const_defined?(:Application)
-					Object.const_get(:Application)
-				else
-					Console.warn(self, "No Application class defined, using default.")
-					::Lively::Application
-				end
+			# The environment module for the selected transport.
+			# @returns [Module]
+			def transport_environment
+				htty ? htty_environment : http_environment
 			end
 			
-			# Build the middleware stack for this application.
-			# @returns [Protocol::HTTP::Middleware] The complete middleware stack.
-			def middleware
-				::Protocol::HTTP::Middleware.build do |builder|
-					builder.use Lively::Assets, root: File.expand_path("public", self.root)
-					builder.use Lively::Assets, root: File.expand_path("../../../public", __dir__)
-					builder.use self.application
-				end
+			# Build the service by composing the transport environment on top of this one.
+			# Called by Async::Service::Generic.wrap — self is the evaluator at call time.
+			# @parameter environment [Async::Service::Environment]
+			# @returns [Async::Service::Generic]
+			def make_service(environment)
+				combined = environment.with(transport_environment)
+				combined_evaluator = combined.evaluator
+				
+				# Call `service_class.new` directly rather than `Async::Service::Generic.wrap` — the combined evaluator still has `Application` (and therefore `make_service`) in its ancestor chain, so `wrap` would recurse back into this method.
+				return combined_evaluator.service_class.new(combined, combined_evaluator)
 			end
 		end
 	end

data/lib/lively/environment/http.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2021-2026, by Samuel Williams.
+
+require_relative "middleware"
+require "falcon/environment/server"
+
+# @namespace
+module Lively
+	# @namespace
+	module Environment
+		# Falcon (TCP/HTTP) environment for Lively applications.
+		#
+		# Combines {Falcon::Environment::Server} for HTTP transport with
+		# {Lively::Environment::Middleware} for application and asset serving.
+		module HTTP
+			include Falcon::Environment::Server
+			include Lively::Environment::Middleware
+			
+			# The URL this server binds to.
+			# @returns [String]
+			def url
+				ENV.fetch("LIVELY_URL", "http://localhost:9292")
+			end
+			
+			# The number of worker processes/threads to run.
+			# @returns [Integer]
+			def count
+				1
+			end
+		end
+	end
+end

data/lib/lively/environment/htty.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+require_relative "middleware"
+require "async/htty/environment/server"
+
+# @namespace
+module Lively
+	# @namespace
+	module Environment
+		# HTTY (terminal side-channel) environment for Lively applications.
+		#
+		# Combines {Async::HTTY::Environment} for HTTY transport with
+		# {Lively::Environment::Middleware} for application and asset serving.
+		module HTTY
+			include Async::HTTY::Environment::Server
+			include Lively::Environment::Middleware
+		end
+	end
+end

data/lib/lively/environment/middleware.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2021-2026, by Samuel Williams.
+
+require_relative "../application"
+require_relative "../assets"
+
+require "protocol/http/middleware/builder"
+
+# @namespace
+module Lively
+	# @namespace
+	module Environment
+		# Shared middleware configuration for Lively application environments.
+		#
+		# Provides the application class resolver, asset middleware, and the
+		# Lively middleware stack. Included by both {HTTP} and {HTTY} environments.
+		module Middleware
+			# Get the root directory for this application.
+			# @returns [String] The current working directory.
+			def root
+				Dir.pwd
+			end
+			
+			# Resolve the application class to use.
+			# @returns [Class] The application class, either user-defined or default.
+			def application
+				if Object.const_defined?(:Application)
+					Object.const_get(:Application)
+				else
+					Console.warn(self, "No Application class defined, using default.")
+					::Lively::Application
+				end
+			end
+			
+			# Build the middleware stack for this application.
+			# @returns [Protocol::HTTP::Middleware] The complete middleware stack.
+			def middleware
+				::Protocol::HTTP::Middleware.build do |builder|
+					builder.use Lively::Assets, root: File.expand_path("public", self.root)
+					builder.use Lively::Assets, root: File.expand_path("../../../public", __dir__)
+					builder.use self.application
+				end
+			end
+		end
+	end
+end

data/lib/lively/resolver.rb

@@ -13,7 +13,7 @@ module Lively
 	class Resolver < Live::Resolver
 		# Initialize a new resolver with shared state.
 		# @parameter state [Hash] Key-value pairs to pass to view constructors as keyword arguments.
-		def initialize(state = nil)
+		def initialize(state = {})
 			super()
 			@state = state
 		end

data/lib/lively/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Lively
-	VERSION = "0.17.1"
+	VERSION = "0.18.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lively
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-htty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-service
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: falcon
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +151,9 @@ files:
 - lib/lively/application.rb
 - lib/lively/assets.rb
 - lib/lively/environment/application.rb
+- lib/lively/environment/http.rb
+- lib/lively/environment/htty.rb
+- lib/lively/environment/middleware.rb
 - lib/lively/hello_world.rb
 - lib/lively/pages/index.rb
 - lib/lively/pages/index.xrb